diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index 53e964dee..547f757a0 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.187 2008/07/23 07:36:55 djm Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.188 2008/10/09 03:50:54 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -380,7 +380,7 @@ static struct { | |||
380 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, | 380 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, |
381 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, | 381 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, |
382 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, | 382 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, |
383 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_GLOBAL }, | 383 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, |
384 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, | 384 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, |
385 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, | 385 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, |
386 | { "compression", sCompression, SSHCFG_GLOBAL }, | 386 | { "compression", sCompression, SSHCFG_GLOBAL }, |
@@ -1378,6 +1378,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) | |||
1378 | M_CP_INTOPT(hostbased_authentication); | 1378 | M_CP_INTOPT(hostbased_authentication); |
1379 | M_CP_INTOPT(kbd_interactive_authentication); | 1379 | M_CP_INTOPT(kbd_interactive_authentication); |
1380 | M_CP_INTOPT(permit_root_login); | 1380 | M_CP_INTOPT(permit_root_login); |
1381 | M_CP_INTOPT(permit_empty_passwd); | ||
1381 | 1382 | ||
1382 | M_CP_INTOPT(allow_tcp_forwarding); | 1383 | M_CP_INTOPT(allow_tcp_forwarding); |
1383 | M_CP_INTOPT(allow_agent_forwarding); | 1384 | M_CP_INTOPT(allow_agent_forwarding); |