diff options
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 | 23 |
1 files changed, 17 insertions, 6 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 index fa4c8d0a67..deed78ffb9 100644 --- a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch +++ b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Subject: [PATCH 6/6] dropbear configuration file | 1 | From e3a5db1b6d3f6382a15b2266458c26c645a10f18 Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <Mingli.Yu@windriver.com> | ||
3 | Date: Thu, 6 Sep 2018 15:54:00 +0800 | ||
4 | Subject: [PATCH] dropbear configuration file | ||
2 | 5 | ||
3 | dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \ | 6 | 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" | 7 | to "/etc/pam.d/dropbear for dropbear when enabling pam supporting" |
@@ -7,12 +10,17 @@ Upstream-Status: Inappropriate [configuration] | |||
7 | 10 | ||
8 | Signed-off-by: Maxin B. John <maxin.john@enea.com> | 11 | Signed-off-by: Maxin B. John <maxin.john@enea.com> |
9 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | 12 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> |
13 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
10 | --- | 14 | --- |
11 | diff -Naur dropbear-2013.60-orig/svr-authpam.c dropbear-2013.60/svr-authpam.c | 15 | svr-authpam.c | 2 +- |
12 | --- dropbear-2013.60-orig/svr-authpam.c 2013-10-16 16:34:53.000000000 +0200 | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | +++ dropbear-2013.60/svr-authpam.c 2013-10-21 17:04:04.969416055 +0200 | 17 | |
14 | @@ -211,7 +211,7 @@ | 18 | diff --git a/svr-authpam.c b/svr-authpam.c |
15 | userData.passwd = password; | 19 | index d201bc9..165ec5c 100644 |
20 | --- a/svr-authpam.c | ||
21 | +++ b/svr-authpam.c | ||
22 | @@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) { | ||
23 | } | ||
16 | 24 | ||
17 | /* Init pam */ | 25 | /* Init pam */ |
18 | - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { | 26 | - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { |
@@ -20,3 +28,6 @@ diff -Naur dropbear-2013.60-orig/svr-authpam.c dropbear-2013.60/svr-authpam.c | |||
20 | dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", | 28 | dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", |
21 | rc, pam_strerror(pamHandlep, rc)); | 29 | rc, pam_strerror(pamHandlep, rc)); |
22 | goto cleanup; | 30 | goto cleanup; |
31 | -- | ||
32 | 2.7.4 | ||
33 | |||