diff options
| author | djm <djm> | 2010-06-26 00:01:33 +0000 |
|---|---|---|
| committer | djm <djm> | 2010-06-26 00:01:33 +0000 |
| commit | d2fa903264c8d6e44371534ad7cb6773b4006d16 (patch) | |
| tree | 765900bd3521f1fa229d5115fcbad6d6d07595a8 /auth2-none.c | |
| parent | 96ca3fdc5caf77031dae47f67b722145cb8d1249 (diff) | |
| download | openssh-d2fa903264c8d6e44371534ad7cb6773b4006d16.tar.gz | |
- djm@cvs.openbsd.org 2010/06/25 08:46:17
[auth1.c auth2-none.c]
skip the initial check for access with an empty password when
PermitEmptyPasswords=no; bz#1638; ok markus@
Diffstat (limited to 'auth2-none.c')
| -rw-r--r-- | auth2-none.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2-none.c b/auth2-none.c index 08f2f935..c8c6c74a 100644 --- a/auth2-none.c +++ b/auth2-none.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-none.c,v 1.15 2008/07/02 12:36:39 djm Exp $ */ +/* $OpenBSD: auth2-none.c,v 1.16 2010/06/25 08:46:17 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -61,7 +61,7 @@ userauth_none(Authctxt *authctxt) { none_enabled = 0; packet_check_eom(); - if (options.password_authentication) + if (options.permit_empty_passwd && options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); } |