Mercurial > dropbear
changeset 692:c58a15983808
Allow configuring "allow blank password option" at runtime
Changes this from a compile-time switch to a command-line option.
Signed-off-by: Paul Eggleton <[email protected]>
| author | Paul Eggleton <paul.eggleton@linux.intel.com> |
|---|---|
| date | Tue, 12 Feb 2013 15:52:57 +0000 |
| parents | e698d1a9f428 |
| children | c85bb68e1db6 |
| files | options.h runopts.h svr-auth.c svr-authpasswd.c svr-runopts.c |
| diffstat | 5 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/options.h Fri Feb 22 23:54:47 2013 +0800 +++ b/options.h Tue Feb 12 15:52:57 2013 +0000 @@ -180,11 +180,6 @@ #define ENABLE_SVR_PUBKEY_OPTIONS #endif -/* Define this to allow logging in to accounts that have no password specified. - * Public key logins are allowed for blank-password accounts regardless of this - * setting. */ -/* #define ALLOW_BLANK_PASSWORD */ - #define ENABLE_CLI_PASSWORD_AUTH #define ENABLE_CLI_PUBKEY_AUTH #define ENABLE_CLI_INTERACT_AUTH
--- a/runopts.h Fri Feb 22 23:54:47 2013 +0800 +++ b/runopts.h Tue Feb 12 15:52:57 2013 +0000 @@ -89,6 +89,7 @@ int noauthpass; int norootpass; + int allowblankpass; #ifdef ENABLE_SVR_REMOTETCPFWD int noremotetcp;
--- a/svr-auth.c Fri Feb 22 23:54:47 2013 +0800 +++ b/svr-auth.c Tue Feb 12 15:52:57 2013 +0000 @@ -154,8 +154,8 @@ strncmp(methodname, AUTH_METHOD_NONE, AUTH_METHOD_NONE_LEN) == 0) { TRACE(("recv_msg_userauth_request: 'none' request")) -#ifdef ALLOW_BLANK_PASSWORD - if (!svr_opts.noauthpass + if (svr_opts.allowblankpass + && !svr_opts.noauthpass && !(svr_opts.norootpass && ses.authstate.pw_uid == 0) && ses.authstate.pw_passwd[0] == '\0') { @@ -167,7 +167,6 @@ goto out; } else -#endif { send_msg_userauth_failure(0, 0); goto out;
--- a/svr-authpasswd.c Fri Feb 22 23:54:47 2013 +0800 +++ b/svr-authpasswd.c Tue Feb 12 15:52:57 2013 +0000 @@ -29,6 +29,7 @@ #include "buffer.h" #include "dbutil.h" #include "auth.h" +#include "runopts.h" #ifdef ENABLE_SVR_PASSWORD_AUTH
--- a/svr-runopts.c Fri Feb 22 23:54:47 2013 +0800 +++ b/svr-runopts.c Tue Feb 12 15:52:57 2013 +0000 @@ -63,6 +63,7 @@ #if defined(ENABLE_SVR_PASSWORD_AUTH) || defined(ENABLE_SVR_PAM_AUTH) "-s Disable password logins\n" "-g Disable password logins for root\n" + "-B Allow blank password logins\n" #endif #ifdef ENABLE_SVR_LOCALTCPFWD "-j Disable local port forwarding\n" @@ -115,6 +116,7 @@ svr_opts.norootlogin = 0; svr_opts.noauthpass = 0; svr_opts.norootpass = 0; + svr_opts.allowblankpass = 0; svr_opts.inetdmode = 0; svr_opts.portcount = 0; svr_opts.hostkey = NULL; @@ -234,6 +236,9 @@ case 'g': svr_opts.norootpass = 1; break; + case 'B': + svr_opts.allowblankpass = 1; + break; #endif case 'h': printhelp(argv[0]);