From: damien <damien>
Date: Wed, 29 Dec 1999 22:48:15 +0000 (+0000)
Subject:  - OpenBSD CVS updates:
X-Git-Tag: V_1_2_1_PRE23~3
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/13f825f499bfcd084386ae0f159ab442b3551203

 - OpenBSD CVS updates:
   - [auth-passwd.c]
     check for NULL 1st
---

diff --git a/ChangeLog b/ChangeLog
index 8fcd17d0..38bd4506 100644
--- 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 9edffd4f..8e28adc3 100644
--- 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) {