diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth2-none.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -32,6 +32,10 @@ | |||
32 | - markus@cvs.openbsd.org 2003/07/30 07:53:27 | 32 | - markus@cvs.openbsd.org 2003/07/30 07:53:27 |
33 | [progressmeter.c] | 33 | [progressmeter.c] |
34 | whitespace (included with previous import) | 34 | whitespace (included with previous import) |
35 | - markus@cvs.openbsd.org 2003/07/31 09:21:02 | ||
36 | [auth2-none.c] | ||
37 | check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za | ||
38 | ok henning | ||
35 | 39 | ||
36 | - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] | 40 | - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] |
37 | Add a tcgetpgrp function. | 41 | Add a tcgetpgrp function. |
@@ -774,4 +778,4 @@ | |||
774 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 778 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
775 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 779 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
776 | 780 | ||
777 | $Id: ChangeLog,v 1.2875 2003/08/02 14:00:47 dtucker Exp $ | 781 | $Id: ChangeLog,v 1.2876 2003/08/02 14:05:01 dtucker Exp $ |
diff --git a/auth2-none.c b/auth2-none.c index 692a2961f..3332f4f83 100644 --- a/auth2-none.c +++ b/auth2-none.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-none.c,v 1.4 2002/06/27 10:35:47 deraadt Exp $"); | 26 | RCSID("$OpenBSD: auth2-none.c,v 1.5 2003/07/31 09:21:02 markus Exp $"); |
27 | 27 | ||
28 | #include "auth.h" | 28 | #include "auth.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -100,7 +100,9 @@ userauth_none(Authctxt *authctxt) | |||
100 | if (check_nt_auth(1, authctxt->pw) == 0) | 100 | if (check_nt_auth(1, authctxt->pw) == 0) |
101 | return(0); | 101 | return(0); |
102 | #endif | 102 | #endif |
103 | return PRIVSEP(auth_password(authctxt, "")) && authctxt->valid; | 103 | if (options.password_authentication && authctxt->valid) |
104 | return (PRIVSEP(auth_password(authctxt, ""))); | ||
105 | return (0); | ||
104 | } | 106 | } |
105 | 107 | ||
106 | Authmethod method_none = { | 108 | Authmethod method_none = { |