summaryrefslogtreecommitdiff
path: root/auth2-none.c
diff options
context:
space:
mode:
authordtucker <dtucker>2003-08-02 14:05:01 +0000
committerdtucker <dtucker>2003-08-02 14:05:01 +0000
commited95ed7a4a5381ae122ae34b0d8feeafa1a3f441 (patch)
tree8f53f26d430bc27320e9378b57d1c669538010fa /auth2-none.c
parent321c37b00700ce9e2e3ab5943732cdfe0f7afe2e (diff)
downloadopenssh-ed95ed7a4a5381ae122ae34b0d8feeafa1a3f441.tar.gz
- markus@cvs.openbsd.org 2003/07/31 09:21:02
[auth2-none.c] check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za ok henning
Diffstat (limited to 'auth2-none.c')
-rw-r--r--auth2-none.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/auth2-none.c b/auth2-none.c
index 692a2961..3332f4f8 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -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.5 2003/07/31 09:21:02 markus Exp $");
#include "auth.h"
#include "xmalloc.h"
@@ -100,7 +100,9 @@ userauth_none(Authctxt *authctxt)
if (check_nt_auth(1, authctxt->pw) == 0)
return(0);
#endif
- return PRIVSEP(auth_password(authctxt, "")) && authctxt->valid;
+ if (options.password_authentication && authctxt->valid)
+ return (PRIVSEP(auth_password(authctxt, "")));
+ return (0);
}
Authmethod method_none = {