o Merge to OPENSSH_3_6_1P1_GSSAPI_20030408.

[gssapi-openssh.git] / openssh / auth-pam.c

diff --git a/openssh/auth-pam.c b/openssh/auth-pam.c
index be521ff9f76ae65c1f657cf0cd1642acecd341cb..09fc3d5052f4ff2087e9252b8a864b1a8425b89e 100644 (file)
--- a/openssh/auth-pam.c
+++ b/openssh/auth-pam.c
@@ -210,14 +210,6 @@ int auth_pam_password(Authctxt *authctxt, const char *password)
 
        do_pam_set_conv(&conv);
 
-       /* deny if no user. */
-       if (pw == NULL)
-               return 0;
-       if (pw->pw_uid == 0 && options.permit_root_login == PERMIT_NO_PASSWD)
-               return 0;
-       if (*password == '\0' && options.permit_empty_passwd == 0)
-               return 0;
-
        __pampasswd = password;
 
        pamstate = INITIAL_LOGIN;