- (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 a8a78386db236c05833ab83fbddc0f0c5b4c03c9..0418a7d7e9bb77f34e70cc066295a008a2947a9b 100644 (file)
--- 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 654e0b8213e1d9df860e8c1a169b077357ff2833..6e6d0d76a10b0e294c30470f78cfb6dc5143bc2c 100644 (file)
--- 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();