===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth-passwd.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- src/usr.bin/ssh/auth-passwd.c	1999/12/01 16:54:35	1.13
+++ src/usr.bin/ssh/auth-passwd.c	1999/12/29 12:47:46	1.14
@@ -8,7 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: auth-passwd.c,v 1.13 1999/12/01 16:54:35 markus Exp $");
+RCSID("$Id: auth-passwd.c,v 1.14 1999/12/29 12:47:46 markus Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -25,12 +25,12 @@
 	extern ServerOptions options;
 	char *encrypted_password;
 
+	/* 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