diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-12-17 12:04:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-14 11:33:52 +0000 |
commit | 6c93994dee481d8cd6e92adc11e50a113736b98e (patch) | |
tree | 9625c39eb89539eab7d20652371616af2e5977a1 /meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch | |
parent | ad6f3ea1b4e2d05a9308e957bc7431fa8f96a342 (diff) | |
download | poky-6c93994dee481d8cd6e92adc11e50a113736b98e.tar.gz |
dropbear: upgrade to 2013.62
LIC_FILES_CHKSUM has changed with the introduction of a BSD-3-Clause
algorithm (curve25519-donna); this has prompted a re-evaluation of the
LICENSE value which should now reflect the licenses declared in the
upstream documentation. Thanks to Beth Flanagan for helping with this.
(From OE-Core rev: 232e8b96988ffa6e5107917fbf41222d26e4e90b)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch new file mode 100644 index 0000000000..fa4c8d0a67 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Subject: [PATCH 6/6] dropbear configuration file | ||
2 | |||
3 | dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \ | ||
4 | to "/etc/pam.d/dropbear for dropbear when enabling pam supporting" | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Maxin B. John <maxin.john@enea.com> | ||
9 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
10 | --- | ||
11 | diff -Naur dropbear-2013.60-orig/svr-authpam.c dropbear-2013.60/svr-authpam.c | ||
12 | --- dropbear-2013.60-orig/svr-authpam.c 2013-10-16 16:34:53.000000000 +0200 | ||
13 | +++ dropbear-2013.60/svr-authpam.c 2013-10-21 17:04:04.969416055 +0200 | ||
14 | @@ -211,7 +211,7 @@ | ||
15 | userData.passwd = password; | ||
16 | |||
17 | /* Init pam */ | ||
18 | - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { | ||
19 | + if ((rc = pam_start("dropbear", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { | ||
20 | dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", | ||
21 | rc, pam_strerror(pamHandlep, rc)); | ||
22 | goto cleanup; | ||