1 files changed, 4 insertions, 4 deletions

diff --git a/auth2-none.c b/auth2-none.c
index c342addec..46a4c617e 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-none.c,v 1.6 2003/08/26 09:58:43 markus Exp $");
+RCSID("$OpenBSD: auth2-none.c,v 1.4 2002/06/27 10:35:47 deraadt Exp $");
 
 #include "auth.h"
 #include "xmalloc.h"
@@ -100,9 +100,9 @@ userauth_none(Authctxt *authctxt)
         if (check_nt_auth(1, authctxt->pw) == 0)
                 return(0);
 #endif
-        if (options.password_authentication)
-                return (PRIVSEP(auth_password(authctxt, "")));
-        return (0);
+        if (options.permit_empty_passwd == 0)
+                return 0;
+        return PRIVSEP(auth_password(authctxt, "")) && authctxt->valid;
 }
 
 Authmethod method_none = {