Import of OpenSSH 3.6.1p2

[gssapi-openssh.git] / openssh / auth2-none.c

diff --git a/openssh/auth2-none.c b/openssh/auth2-none.c
index c07b2dd814883e80969e780538028d4250845cb1..692a2961f9e7b10cfbfd26d44c78cd725eed950d 100644 (file)
--- a/openssh/auth2-none.c
+++ b/openssh/auth2-none.c
@@ -100,7 +100,7 @@ userauth_none(Authctxt *authctxt)
        if (check_nt_auth(1, authctxt->pw) == 0)
                return(0);
 #endif
-       return (authctxt->valid ? PRIVSEP(auth_password(authctxt, "")) : 0);
+       return PRIVSEP(auth_password(authctxt, "")) && authctxt->valid;
 }
 
 Authmethod method_none = {