summaryrefslogtreecommitdiff
path: root/auth2-none.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-06-26 10:01:33 +1000
committerDamien Miller <djm@mindrot.org>2010-06-26 10:01:33 +1000
commitbda3ecafcafd85856c6ffd0ba54b85afe6d71a84 (patch)
treed178623178ba625c2880c0ee62cc0ddf9d75e524 /auth2-none.c
parent8853ca5fc46b7b71c74baeefb9b0899c7fcfdb9a (diff)
- 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2-none.c b/auth2-none.c
index 08f2f935f..c8c6c74a9 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-none.c,v 1.15 2008/07/02 12:36:39 djm Exp $ */ 1/* $OpenBSD: auth2-none.c,v 1.16 2010/06/25 08:46:17 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -61,7 +61,7 @@ userauth_none(Authctxt *authctxt)
61{ 61{
62 none_enabled = 0; 62 none_enabled = 0;
63 packet_check_eom(); 63 packet_check_eom();
64 if (options.password_authentication) 64 if (options.permit_empty_passwd && options.password_authentication)
65 return (PRIVSEP(auth_password(authctxt, ""))); 65 return (PRIVSEP(auth_password(authctxt, "")));
66 return (0); 66 return (0);
67} 67}