diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2010-11-08 10:45:44 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2010-11-08 10:45:44 +0000 |
| commit | 3a927e69c380468bb32766c99aa7caf86de401a4 (patch) | |
| tree | a92a6ad754f3ce37585ea89bd5d2693dbc5991ef /auth2-none.c | |
| parent | f276912e6fa1da1174ba900a7e5d6447d71fc8e7 (diff) | |
| download | src-3a927e69c380468bb32766c99aa7caf86de401a4.tar.gz src-3a927e69c380468bb32766c99aa7caf86de401a4.zip | |
Vendor import of OpenSSH 5.6p1vendor/openssh/5.6p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=214979
svn path=/vendor-crypto/openssh/5.6p1/; revision=214980; tag=vendor/openssh/5.6p1
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 08f2f935fe98..c8c6c74a9347 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); } |