summaryrefslogtreecommitdiffstats
path: root/auth2-none.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-08-03 00:05:01 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-08-03 00:05:01 +1000
commit4b60966863d241efc29f0897a7f299ec8e5f6c2b (patch)
tree92291940a67d0abdd4d3c4cdded4778dbf9a3707 /auth2-none.c
parent40311f2feba510bc646710ca3c44c61b7a21a73c (diff)
- 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 = {