===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2-none.c,v
retrieving revision 1.4.4.2
retrieving revision 1.5
diff -u -r1.4.4.2 -r1.5
--- src/usr.bin/ssh/auth2-none.c	2004/03/04 18:18:15	1.4.4.2
+++ src/usr.bin/ssh/auth2-none.c	2003/07/31 09:21:02	1.5
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-none.c,v 1.4.4.2 2004/03/04 18:18:15 brad Exp $");
+RCSID("$OpenBSD: auth2-none.c,v 1.5 2003/07/31 09:21:02 markus Exp $");
 
 #include "auth.h"
 #include "xmalloc.h"
@@ -96,7 +96,7 @@
 	none_enabled = 0;
 	packet_check_eom();
 	userauth_banner();
-	if (options.password_authentication)
+	if (options.password_authentication && authctxt->valid)
 		return (PRIVSEP(auth_password(authctxt, "")));
 	return (0);
 }