diff options
author | Mei Lei <lei.mei@intel.com> | 2011-12-07 23:15:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-08 15:14:04 +0000 |
commit | e876096fcbb42039d568a7acbc506e4099e9a443 (patch) | |
tree | 7b7789a6182ddb87b0796115f15111bac2564466 /meta/recipes-core/dropbear/dropbear | |
parent | dc433b556f5b44a6d818a81df6be484ad59daebd (diff) | |
download | openembedded-core-e876096fcbb42039d568a7acbc506e4099e9a443.tar.gz |
dropbear: Upgrade from 0.53.1 to 2011.54
This new version added ALLOW_BLANK_PASSWORD option. So change the allow-nopw.patch content to enable this function.
Signed-off-by: Mei Lei <lei.mei@intel.com>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/allow-nopw.patch | 55 |
1 files changed, 17 insertions, 38 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch index 3909ef26e7..a175ee14da 100644 --- a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch +++ b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch @@ -1,40 +1,19 @@ -Upstream-Status: Inappropriate [embedded specific] +Enable blank password login function for new release dropbear. -diff --git a/svr-auth.c b/svr-auth.c -index 87e3c5e..3e78c1a 100644 ---- a/svr-auth.c -+++ b/svr-auth.c -@@ -250,6 +250,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { - } - - /* check for an empty password */ -+#ifdef DISALLOW_EMPTY_PW - if (ses.authstate.pw_passwd[0] == '\0') { - TRACE(("leave checkusername: empty pword")) - dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", -@@ -257,6 +258,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { - send_msg_userauth_failure(0, 1); - return DROPBEAR_FAILURE; - } -+#endif - - TRACE(("shell is %s", ses.authstate.pw_shell)) - -diff --git a/svr-authpasswd.c b/svr-authpasswd.c -index a29fd63..6a3c7e9 100644 ---- a/svr-authpasswd.c -+++ b/svr-authpasswd.c -@@ -64,9 +64,13 @@ void svr_auth_password() { - * since the shadow password may differ to that tested - * in auth.c */ - if (passwdcrypt[0] == '\0') { -+#ifdef DISALLOW_EMPTY_PASSWD - dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", - ses.authstate.pw_name); - send_msg_userauth_failure(0, 1); -+#else -+ send_msg_userauth_success(); -+#endif - return; - } +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mei Lei <lei.mei@intel.com> + +diff --git a/options.h b/options.h +index 73689ad..041ddaa 100644 +--- a/options.h ++++ b/options.h +@@ -180,7 +180,7 @@ much traffic. */ + * Public key logins are allowed for blank-password accounts regardless of this + * setting. PAM is not affected by this setting, it uses the normal pam.d + * settings ('nullok' option) */ +-/* #define ALLOW_BLANK_PASSWORD */ ++#define ALLOW_BLANK_PASSWORD + #define ENABLE_CLI_PASSWORD_AUTH + #define ENABLE_CLI_PUBKEY_AUTH |