Merge 4.2p1 to the trunk.

1 files changed, 3 insertions, 1 deletions

diff --git a/auth-passwd.c b/auth-passwd.c
index 654e0b821..6e6d0d76a 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();