diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2003-08-03 00:05:01 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2003-08-03 00:05:01 +1000 |
| commit | 4b60966863d241efc29f0897a7f299ec8e5f6c2b (patch) | |
| tree | 92291940a67d0abdd4d3c4cdded4778dbf9a3707 | |
| parent | 40311f2feba510bc646710ca3c44c61b7a21a73c (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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | auth2-none.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -32,6 +32,10 @@ - markus@cvs.openbsd.org 2003/07/30 07:53:27 [progressmeter.c] whitespace (included with previous import) + - 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 - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] Add a tcgetpgrp function. @@ -774,4 +778,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2875 2003/08/02 14:00:47 dtucker Exp $ +$Id: ChangeLog,v 1.2876 2003/08/02 14:05:01 dtucker Exp $ 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 = { |