summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-09-02 09:08:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-02 18:13:36 +0100
commit4bc94f1896aad7f540ac520cd69edf3e96029319 (patch)
treed60570ccce77bd2149e53f2223b8f85650d74e1d
parent2c0c78fc777a7dbe098f2518ecbaf24d03227f5d (diff)
downloadopenembedded-core-4bc94f1896aad7f540ac520cd69edf3e96029319.tar.gz
openembedded-core-4bc94f1896aad7f540ac520cd69edf3e96029319.tar.bz2
openembedded-core-4bc94f1896aad7f540ac520cd69edf3e96029319.tar.xz
openembedded-core-4bc94f1896aad7f540ac520cd69edf3e96029319.zip
dropbear: add missing files
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dropbear/dropbear/dropbear4
-rw-r--r--meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch18
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear b/meta/recipes-core/dropbear/dropbear/dropbear
new file mode 100644
index 000000000..47e787fb1
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear
@@ -0,0 +1,4 @@
+#%PAM-1.0
+
+auth include common-auth
+account include common-account
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch b/meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch
new file mode 100644
index 000000000..5e9455363
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch
@@ -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 <xiaofeng.yan@windriver.com>
+
+--- 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;