summaryrefslogtreecommitdiffstats
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:15:30 +0100
commit9ba02cca0e95a823613a6b5c04d8d2437b4e1a5f (patch)
tree7023f49833ab49cc28974325d38188f2f2ef4887
parent380f38cfdfc98665896633bcd4b869562e8aca7c (diff)
downloadpoky-9ba02cca0e95a823613a6b5c04d8d2437b4e1a5f.tar.gz
dropbear: add missing files
(From OE-Core rev: 4bc94f1896aad7f540ac520cd69edf3e96029319) 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 0000000000..47e787fb10
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear
@@ -0,0 +1,4 @@
1#%PAM-1.0
2
3auth include common-auth
4account 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 0000000000..5e9455363a
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch
@@ -0,0 +1,18 @@
1dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \
2to "/etc/pam.d/dropbear for dropbear when enabling pam supporting"
3
4Upstream-Status: Inappropriate [configuration]
5
6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
7
8--- a/svr-authpam.c 2008-11-11 22:09:03.000000000 +0800
9+++ b/svr-authpam.c.new 2011-08-29 09:53:24.000000000 +0800
10@@ -199,7 +199,7 @@
11 userData.passwd = password;
12
13 /* Init pam */
14- if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
15+ if ((rc = pam_start("dropbear", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
16 dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s\n",
17 rc, pam_strerror(pamHandlep, rc));
18 goto cleanup;