| Submitter | Koen Kooi |
|---|---|
| Date | Sept. 2, 2011, 7:08 a.m. |
| Message ID | <1314947318-17889-1-git-send-email-koen@dominion.thruhere.net> |
| Download | mbox | patch |
| Permalink | /patch/10885/ |
| State | New, archived |
| Headers | show |
Comments
On Fri, 2011-09-02 at 09:08 +0200, Koen Kooi wrote: > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > --- > meta/recipes-core/dropbear/dropbear/dropbear | 4 ++++ > .../dropbear/dropbear-configuration-file.patch | 18 ++++++++++++++++++ > 2 files changed, 22 insertions(+), 0 deletions(-) > create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear > create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch Merged to master, thanks. Richard
Patch
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear b/meta/recipes-core/dropbear/dropbear/dropbear new file mode 100644 index 0000000..47e787f --- /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 0000000..5e94553 --- /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;
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- meta/recipes-core/dropbear/dropbear/dropbear | 4 ++++ .../dropbear/dropbear-configuration-file.patch | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch