Skip to contentSkip to conversation

dropbear: Change the path to find configuration file and add s configuration file for dropbear

PATCH In review Xiaofeng Yan 2 participants 4 messages Aug 29, 2011 – Aug 31, 2011

lore
Share & tools
lore

Xiaofeng Yan

author
#0 lore raw

cover dropbear: Change the path to find configuration file and add s configuration file for dropbear

From: Xiaofeng Yan <[email protected]>

dropbear will check "/etc/pam.d/sshd" which comes from package "openssh" \
When enabling pam supporting. But if we only install dropbear \
package without package "openssh", then "dropbear" will not \
find a configuration file. The changes are as follow for fixing this bug:
- Change the path to find configuration file (/etc/pam.d/sshd --> /etc/pam.d/dropbear)
- Add configuration file "/etc/pam.d/dropbear"

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/dropbear
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/dropbear

Thanks,
Xiaofeng Yan <[email protected]>
---

Xiaofeng Yan (1):
dropbear: Change the path to find configuration file and add a
configuration file for dropbear

 meta/recipes-core/dropbear/dropbear.inc            |    6 +++++-
 meta/recipes-core/dropbear/dropbear/dropbear       |    4 ++++
 .../dropbear/dropbear-configuration-file.patch     |   18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear
 create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch
author
#1 lore raw

PATCH 1/1 dropbear: Change the path to find configuration file and add a configuration file for dropbear

From: Xiaofeng Yan <[email protected]>

dropbear will check "/etc/pam.d/sshd" which comes from package "openssh" \
When enabling pam supporting. But if we only install dropbear \
package without package "openssh", then "dropbear" will not \
find a configuration file. The changes are as follow for fixing this bug:

- Change the path to find configuration file (/etc/pam.d/sshd --> /etc/pam.d/dropbear)
- Add a configuration file "/etc/pam.d/dropbear"

Signed-off-by Xiaofeng Yan <[email protected]>
---
 meta/recipes-core/dropbear/dropbear.inc            |    6 +++++-
 meta/recipes-core/dropbear/dropbear/dropbear       |    4 ++++
 .../dropbear/dropbear-configuration-file.patch     |   18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear
 create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch
meta/recipes-core/dropbear/dropbear.inc +5 -1
index 5af9ebd..577b288 100644
@@ -19,7 +19,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
 	         file://init \
                  ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
 
-PAM_SRC_URI = "file://dropbear-enable-pam.patch"
+PAM_SRC_URI = "file://dropbear-enable-pam.patch \
+               file://dropbear-configuration-file.patch \
+               file://dropbear"
 
 inherit autotools update-rc.d
 

@@ -51,6 +53,7 @@ do_install() {
 		   ${D}${sysconfdir}/init.d \
 		   ${D}${sysconfdir}/default \
 		   ${D}${sysconfdir}/dropbear \
+		   ${D}${sysconfdir}/pam.d \
                    ${D}${bindir} \
 		   ${D}${sbindir} \
 		   ${D}${localstatedir}

@@ -68,6 +71,7 @@ do_install() {
 				  -e 's,/usr/bin,${bindir},g' \
 				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
 	chmod 755 ${D}${sysconfdir}/init.d/dropbear
+	install -m 0644 ${WORKDIR}/dropbear  ${D}${sysconfdir}/pam.d/
 }
 
 pkg_postinst_${PN} () {
meta/recipes-core/dropbear/dropbear/dropbear new file +4 -0
new file mode 100644
index 0000000..47e787f
@@ -0,0 +1,4 @@
+#%PAM-1.0
+
+auth     include  common-auth
+account  include  common-account
meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch new file +18 -0
new file mode 100644
index 0000000..5e94553
@@ -0,0 +1,18 @@
+dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \
+to "/etc/pam.d/dropbear for dropbear when enabling pam supporting" 
+
+Upstream-Status: Inappropriate [configuration] 
+
+Signed-off-by: Xiaofeng Yan <[email protected]>
+
+--- a/svr-authpam.c	2008-11-11 22:09:03.000000000 +0800
++++ b/svr-authpam.c.new	2011-08-29 09:53:24.000000000 +0800
+@@ -199,7 +199,7 @@
+ 	userData.passwd = password;
+ 
+ 	/* Init pam */
+-	if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
++	if ((rc = pam_start("dropbear", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
+ 		dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s\n", 
+ 				rc, pam_strerror(pamHandlep, rc));
+ 		goto cleanup;
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 1/1] dropbear: Change the path to find configuration file and add a configuration file for dropbear

Quoted 43 lines · Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>

dropbear will check "/etc/pam.d/sshd" which comes from package "openssh" \
When enabling pam supporting. But if we only install dropbear \
package without package "openssh", then "dropbear" will not \
find a configuration file. The changes are as follow for fixing this bug:

- Change the path to find configuration file (/etc/pam.d/sshd --> /etc/pam.d/dropbear)
- Add a configuration file "/etc/pam.d/dropbear"

Signed-off-by Xiaofeng Yan <[email protected]>
---
 meta/recipes-core/dropbear/dropbear.inc            |    6 +++++-
 meta/recipes-core/dropbear/dropbear/dropbear       |    4 ++++
 .../dropbear/dropbear-configuration-file.patch     |   18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear
 create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch
meta/recipes-core/dropbear/dropbear.inc +4 -1
index 5af9ebd..577b288 100644
@@ -19,7 +19,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
 	         file://init \
                  ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
 
-PAM_SRC_URI = "file://dropbear-enable-pam.patch"
+PAM_SRC_URI = "file://dropbear-enable-pam.patch \
+               file://dropbear-configuration-file.patch \
+               file://dropbear"
 
 inherit autotools update-rc.d
 

@@ -51,6 +53,7 @@ do_install() {
 		   ${D}${sysconfdir}/init.d \
 		   ${D}${sysconfdir}/default \
 		   ${D}${sysconfdir}/dropbear \
+		   ${D}${sysconfdir}/pam.d \
                    ${D}${bindir} \
 		   ${D}${sbindir} \
 		   ${D}${localstatedir}

meta/recipes-core/dropbear/dropbear.inc do_install() { · line 74

Quoted 4 lines
meta/recipes-core/dropbear/dropbear.inc +1 -0
@@ -68,6 +71,7 @@ do_install() {
 				  -e 's,/usr/bin,${bindir},g' \
 				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
 	chmod 755 ${D}${sysconfdir}/init.d/dropbear
+	install -m 0644 ${WORKDIR}/dropbear  ${D}${sysconfdir}/pam.d/

I suspect this won't build in the DISTRO_FEATURES not containing pam case due to the above file not existing. Please put a check in there to see if it exists.

Cheers,

Richard

author
#3 lore raw

Re: [PATCH 1/1] dropbear: Change the path to find configuration file and add a configuration file for dropbear

Quoted 35 lines · Richard Purdie
Quoted 34 lines · Xiaofeng Yan

From: Xiaofeng Yan<[email protected]>

dropbear will check "/etc/pam.d/sshd" which comes from package "openssh" \
When enabling pam supporting. But if we only install dropbear \
package without package "openssh", then "dropbear" will not \
find a configuration file. The changes are as follow for fixing this bug:

- Change the path to find configuration file (/etc/pam.d/sshd --> /etc/pam.d/dropbear)
- Add a configuration file "/etc/pam.d/dropbear"

Signed-off-by Xiaofeng Yan<[email protected]>
---
  meta/recipes-core/dropbear/dropbear.inc            |    6 +++++-
  meta/recipes-core/dropbear/dropbear/dropbear       |    4 ++++
  .../dropbear/dropbear-configuration-file.patch     |   18 ++++++++++++++++++
  3 files changed, 27 insertions(+), 1 deletions(-)

create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch

meta/recipes-core/dropbear/dropbear.inc +3 -1
index 5af9ebd..577b288 100644
@@ -19,7 +19,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
  	         file://init \
                   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
 
-PAM_SRC_URI = "file://dropbear-enable-pam.patch"
+PAM_SRC_URI = "file://dropbear-enable-pam.patch \
+               file://dropbear-configuration-file.patch \
+               file://dropbear"
 
  inherit autotools update-rc.d
Quoted 17 lines

meta/recipes-core/dropbear/dropbear.inc do_install() { · line 74

Quoted 13 lines
meta/recipes-core/dropbear/dropbear.inc +2 -0
@@ -51,6 +53,7 @@ do_install() {
  		   ${D}${sysconfdir}/init.d \
  		   ${D}${sysconfdir}/default \
  		   ${D}${sysconfdir}/dropbear \
+		   ${D}${sysconfdir}/pam.d \
                     ${D}${bindir} \
  		   ${D}${sbindir} \
  		   ${D}${localstatedir}

@@ -68,6 +71,7 @@ do_install() {
  				  -e 's,/usr/bin,${bindir},g' \
  				  -e 's,/usr,${prefix},g'>  ${D}${sysconfdir}/init.d/dropbear
  	chmod 755 ${D}${sysconfdir}/init.d/dropbear
+	install -m 0644 ${WORKDIR}/dropbear  ${D}${sysconfdir}/pam.d/

I suspect this won't build in the DISTRO_FEATURES not containing pam case due to the above file not existing. Please put a check in there to see if it exists.

Sorry for my fault. you are a really careful man. I will modify my fault.

Thanks
Yan

Quoted 10 lines

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core