- djm@cvs.openbsd.org 2008/10/09 03:50:54
[servconf.c sshd_config.5]
support setting PermitEmptyPasswords in a Match block
requested in PR3891; ok dtucker@
diff --git a/ChangeLog b/ChangeLog
index 35b63fa..347fd18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,10 @@
Add -y option to force logging via syslog rather than stderr.
Useful for daemonised ssh connection (ssh -f). Patch originally from
and ok'd by markus@
+ - djm@cvs.openbsd.org 2008/10/09 03:50:54
+ [servconf.c sshd_config.5]
+ support setting PermitEmptyPasswords in a Match block
+ requested in PR3891; ok dtucker@
20080906
- (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4786,4 +4790,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.5110 2008/11/03 08:22:37 djm Exp $
+$Id: ChangeLog,v 1.5111 2008/11/03 08:23:10 djm Exp $
diff --git a/servconf.c b/servconf.c
index 53e964d..547f757 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.187 2008/07/23 07:36:55 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.188 2008/10/09 03:50:54 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -380,7 +380,7 @@
{ "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
{ "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
{ "strictmodes", sStrictModes, SSHCFG_GLOBAL },
- { "permitemptypasswords", sEmptyPasswd, SSHCFG_GLOBAL },
+ { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
{ "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
{ "uselogin", sUseLogin, SSHCFG_GLOBAL },
{ "compression", sCompression, SSHCFG_GLOBAL },
@@ -1378,6 +1378,7 @@
M_CP_INTOPT(hostbased_authentication);
M_CP_INTOPT(kbd_interactive_authentication);
M_CP_INTOPT(permit_root_login);
+ M_CP_INTOPT(permit_empty_passwd);
M_CP_INTOPT(allow_tcp_forwarding);
M_CP_INTOPT(allow_agent_forwarding);
diff --git a/sshd_config.5 b/sshd_config.5
index 7255b1c..06fe5fd 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,8 +34,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $
-.Dd $Mdocdate: July 2 2008 $
+.\" $OpenBSD: sshd_config.5,v 1.97 2008/10/09 03:50:54 djm Exp $
+.Dd $Mdocdate: October 9 2008 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -605,6 +605,7 @@
.Cm MaxAuthTries ,
.Cm MaxSessions ,
.Cm PasswordAuthentication ,
+.Cm PermitEmptyPasswords ,
.Cm PermitOpen ,
.Cm PermitRootLogin ,
.Cm RhostsRSAAuthentication ,