diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c index 4e3140fe3..19c286c18 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.174 2007/12/31 10:41:31 dtucker Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.175 2008/01/01 09:27:33 dtucker 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 |
@@ -321,7 +321,7 @@ static struct { | |||
321 | { "serverkeybits", sServerKeyBits, SSHCFG_GLOBAL }, | 321 | { "serverkeybits", sServerKeyBits, SSHCFG_GLOBAL }, |
322 | { "logingracetime", sLoginGraceTime, SSHCFG_GLOBAL }, | 322 | { "logingracetime", sLoginGraceTime, SSHCFG_GLOBAL }, |
323 | { "keyregenerationinterval", sKeyRegenerationTime, SSHCFG_GLOBAL }, | 323 | { "keyregenerationinterval", sKeyRegenerationTime, SSHCFG_GLOBAL }, |
324 | { "permitrootlogin", sPermitRootLogin, SSHCFG_GLOBAL }, | 324 | { "permitrootlogin", sPermitRootLogin, SSHCFG_ALL }, |
325 | { "syslogfacility", sLogFacility, SSHCFG_GLOBAL }, | 325 | { "syslogfacility", sLogFacility, SSHCFG_GLOBAL }, |
326 | { "loglevel", sLogLevel, SSHCFG_GLOBAL }, | 326 | { "loglevel", sLogLevel, SSHCFG_GLOBAL }, |
327 | { "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL }, | 327 | { "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL }, |
@@ -806,7 +806,7 @@ parse_filename: | |||
806 | fatal("%s line %d: Bad yes/" | 806 | fatal("%s line %d: Bad yes/" |
807 | "without-password/forced-commands-only/no " | 807 | "without-password/forced-commands-only/no " |
808 | "argument: %s", filename, linenum, arg); | 808 | "argument: %s", filename, linenum, arg); |
809 | if (*intptr == -1) | 809 | if (*activep && *intptr == -1) |
810 | *intptr = value; | 810 | *intptr = value; |
811 | break; | 811 | break; |
812 | 812 | ||
@@ -1351,6 +1351,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) | |||
1351 | M_CP_INTOPT(kerberos_authentication); | 1351 | M_CP_INTOPT(kerberos_authentication); |
1352 | M_CP_INTOPT(hostbased_authentication); | 1352 | M_CP_INTOPT(hostbased_authentication); |
1353 | M_CP_INTOPT(kbd_interactive_authentication); | 1353 | M_CP_INTOPT(kbd_interactive_authentication); |
1354 | M_CP_INTOPT(permit_root_login); | ||
1354 | 1355 | ||
1355 | M_CP_INTOPT(allow_tcp_forwarding); | 1356 | M_CP_INTOPT(allow_tcp_forwarding); |
1356 | M_CP_INTOPT(gateway_ports); | 1357 | M_CP_INTOPT(gateway_ports); |