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 /auth1.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 'auth1.c')
| -rw-r--r-- | auth1.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: auth1.c,v 1.73 2008/07/04 23:30:16 djm Exp $ */ +/* $OpenBSD: auth1.c,v 1.74 2010/06/25 08:46:17 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -244,7 +244,7 @@ do_authloop(Authctxt *authctxt) authctxt->valid ? "" : "invalid user ", authctxt->user); /* If the user has no password, accept authentication immediately. */ - if (options.password_authentication && + if (options.permit_empty_passwd && options.password_authentication && #ifdef KRB5 (!options.kerberos_authentication || options.kerberos_or_local_passwd) && #endif |