From 4b60966863d241efc29f0897a7f299ec8e5f6c2b Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 3 Aug 2003 00:05:01 +1000 Subject: - 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 --- auth2-none.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'auth2-none.c') 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 = { -- cgit v1.2.3