From bda3ecafcafd85856c6ffd0ba54b85afe6d71a84 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 26 Jun 2010 10:01:33 +1000 Subject: - 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@ --- auth2-none.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'auth2-none.c') 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 @@ -/* $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); } -- cgit v1.2.3