- OpenBSD CVS updates:

   - [auth-passwd.c]
     check for NULL 1st

diff --git a/ChangeLog b/ChangeLog
index 8fcd17d06cbe7ad786b1372149304f2b6879196d..38bd450609f5cfc5ee3c0d70178e70f3c974f719 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+19991230
+ - OpenBSD CVS updates:
+   - [auth-passwd.c]
+     check for NULL 1st
+
 19991229
  - Applied another NetBSD portability patch from David Rankin 
    <drankin@bohemians.lexington.ky.us>

diff --git a/auth-passwd.c b/auth-passwd.c
index 9edffd4fe294d9727e47ce0807fda890854d967e..8e28adc3ef51de1f2002b0b8a3942e765a45fa03 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) {