- Prevent typedefs from being compiled more than once. Report from

[openssh.git] / auth-passwd.c

diff --git a/auth-passwd.c b/auth-passwd.c
index 9edffd4fe294d9727e47ce0807fda890854d967e..2ac86242c65b3062a1f30b3a7b49a2359d722ff0 100644 (file)
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -43,13 +43,13 @@ auth_password(struct passwd * pw, const char *password)
        struct spwd *spw;
 #endif
 
+       /* deny if no user. */
+       if (pw == NULL)
+               return 0;
        if (pw->pw_uid == 0 && options.permit_root_login == 2)
                return 0;
        if (*password == '\0' && options.permit_empty_passwd == 0)
                return 0;
-       /* deny if no user. */
-       if (pw == NULL)
-               return 0;
 
 #ifdef SKEY
        if (options.skey_authentication == 1) {
@@ -76,14 +76,14 @@ auth_password(struct passwd * pw, const char *password)
 
 #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
        spw = getspnam(pw->pw_name);
-       if (spw == NULL) 
-               return(0);
+       if (spw != NULL) 
+       {
+               /* Check for users with no password. */
+               if (strcmp(password, "") == 0 && strcmp(spw->sp_pwdp, "") == 0)
+                       return 1;
 
-       /* Check for users with no password. */
-       if (strcmp(password, "") == 0 && strcmp(spw->sp_pwdp, "") == 0)
-               return 1;
-
-       pw_password = spw->sp_pwdp;
+               pw_password = spw->sp_pwdp;
+       }
 #endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
 
        if (pw_password[0] != '\0')