From: djm <djm>
Date: Tue, 26 Jul 2005 11:54:11 +0000 (+0000)
Subject:  - (djm) OpenBSD CVS Sync
X-Git-Tag: V_4_2_P1~31
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/05c25368b25842e321358121b24d6e1bb33be744

 - (djm) OpenBSD CVS Sync
   - otto@cvs.openbsd.org 2005/07/19 15:32:26
     [auth-passwd.c]
     auth_usercheck(3) can return NULL, so check for that. Report from
     mpech@. ok markus@
---

diff --git a/ChangeLog b/ChangeLog
index a8a78386..0418a7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 20050726
  - (dtucker) [configure.ac] Update zlib warning message too, pointed out by
    tim@.
+ - (djm) OpenBSD CVS Sync
+   - otto@cvs.openbsd.org 2005/07/19 15:32:26
+     [auth-passwd.c]
+     auth_usercheck(3) can return NULL, so check for that. Report from
+     mpech@. ok markus@
 
 20050725
  - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.
diff --git a/auth-passwd.c b/auth-passwd.c
index 654e0b82..6e6d0d76 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-passwd.c,v 1.33 2005/01/24 11:47:13 dtucker Exp $");
+RCSID("$OpenBSD: auth-passwd.c,v 1.34 2005/07/19 15:32:26 otto Exp $");
 
 #include "packet.h"
 #include "buffer.h"
@@ -163,6 +163,8 @@ sys_auth_passwd(Authctxt *authctxt, const char *password)
 
 	as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh",
 	    (char *)password);
+	if (as == NULL)
+		return (0);
 	if (auth_getstate(as) & AUTH_PWEXPIRED) {
 		auth_close(as);
 		disable_forwarding();