===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2-none.c,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- src/usr.bin/ssh/auth2-none.c	2002/06/27 10:35:47	1.4
+++ src/usr.bin/ssh/auth2-none.c	2003/09/16 20:50:42	1.4.4.1
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-none.c,v 1.4 2002/06/27 10:35:47 deraadt Exp $");
+RCSID("$OpenBSD: auth2-none.c,v 1.4.4.1 2003/09/16 20:50:42 brad Exp $");
 
 #include "auth.h"
 #include "xmalloc.h"
@@ -96,7 +96,9 @@
 	none_enabled = 0;
 	packet_check_eom();
 	userauth_banner();
-	return (authctxt->valid ? PRIVSEP(auth_password(authctxt, "")) : 0);
+	if (options.password_authentication)
+		return (PRIVSEP(auth_password(authctxt, "")));
+	return (0);
 }
 
 Authmethod method_none = {