- djm@cvs.openbsd.org 2003/11/04 08:54:09

[openssh.git] / auth-passwd.c

diff --git a/auth-passwd.c b/auth-passwd.c
index 971c7ba19d9be09cc4efdd1d37f0c9dfc6c13f53..b7e275556214c07d22a402033ef495633b5c3105 100644 (file)
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-passwd.c,v 1.29 2003/08/26 09:58:43 markus Exp $");
+RCSID("$OpenBSD: auth-passwd.c,v 1.30 2003/11/04 08:54:09 djm Exp $");
 
 #include "packet.h"
 #include "log.h"
@@ -60,11 +60,8 @@ auth_password(Authctxt *authctxt, const char *password)
        struct passwd * pw = authctxt->pw;
        int ok = authctxt->valid;
 
-       /* deny if no user. */
-       if (pw == NULL)
-               return 0;
 #ifndef HAVE_CYGWIN
-       if (pw && pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
+       if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
                ok = 0;
 #endif
        if (*password == '\0' && options.permit_empty_passwd == 0)