summaryrefslogtreecommitdiffhomepage
path: root/svr-auth.c
diff options
context:
space:
mode:
Diffstat (limited to 'svr-auth.c')
-rw-r--r--svr-auth.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/svr-auth.c b/svr-auth.c
index ee2b89f..404232e 100644
--- a/svr-auth.c
+++ b/svr-auth.c
@@ -154,8 +154,8 @@ void recv_msg_userauth_request() {
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 @@ void recv_msg_userauth_request() {
goto out;
}
else
-#endif
{
send_msg_userauth_failure(0, 0);
goto out;