===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth-passwd.c,v
retrieving revision 1.31.4.2
retrieving revision 1.32
diff -u -r1.31.4.2 -r1.32
--- src/usr.bin/ssh/auth-passwd.c	2005/09/02 03:44:59	1.31.4.2
+++ src/usr.bin/ssh/auth-passwd.c	2005/01/21 08:32:02	1.32
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-passwd.c,v 1.31.4.2 2005/09/02 03:44:59 brad Exp $");
+RCSID("$OpenBSD: auth-passwd.c,v 1.32 2005/01/21 08:32:02 otto Exp $");
 
 #include "packet.h"
 #include "buffer.h"
@@ -101,7 +101,7 @@
 
 	pwtimeleft = auth_check_change(as);
 	actimeleft = auth_check_expire(as);
-#ifdef HAVE_LOGIN_CAP
+#if HAVE_LOGIN_CAP
 	if (authctxt->valid) {
 		pwwarntime = login_getcaptime(lc, "password-warn", TWO_WEEKS,
 		    TWO_WEEKS);
@@ -134,8 +134,6 @@
 
 	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();