summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2016-11-23 23:14:15 +0000
committerDamien Miller <djm@mindrot.org>2016-11-24 16:07:26 +1100
commitf0ddedee460486fa0e32fefb2950548009e5026e (patch)
tree3b64b732c52f337ac830068110d46e2f5de0bc8c /servconf.c
parent1a6f9d2e2493d445cd9ee496e6e3c2a2f283f66a (diff)
upstream commit
allow ClientAlive{Interval,CountMax} in Match; ok dtucker, djm Upstream-ID: 8beb4c1eadd588f1080b58932281983864979f55
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c
index a18ebb597..e0bfbe67d 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.299 2016/11/06 05:46:37 djm Exp $ */ 2/* $OpenBSD: servconf.c,v 1.300 2016/11/23 23:14:15 markus Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -528,8 +528,8 @@ static struct {
528 { "usedns", sUseDNS, SSHCFG_GLOBAL }, 528 { "usedns", sUseDNS, SSHCFG_GLOBAL },
529 { "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL }, 529 { "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL },
530 { "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL }, 530 { "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },
531 { "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL }, 531 { "clientaliveinterval", sClientAliveInterval, SSHCFG_ALL },
532 { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, 532 { "clientalivecountmax", sClientAliveCountMax, SSHCFG_ALL },
533 { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL }, 533 { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
534 { "authorizedkeysfile2", sDeprecated, SSHCFG_ALL }, 534 { "authorizedkeysfile2", sDeprecated, SSHCFG_ALL },
535 { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL}, 535 { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
@@ -1975,6 +1975,8 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth)
1975 M_CP_INTOPT(permit_user_rc); 1975 M_CP_INTOPT(permit_user_rc);
1976 M_CP_INTOPT(max_sessions); 1976 M_CP_INTOPT(max_sessions);
1977 M_CP_INTOPT(max_authtries); 1977 M_CP_INTOPT(max_authtries);
1978 M_CP_INTOPT(client_alive_count_max);
1979 M_CP_INTOPT(client_alive_interval);
1978 M_CP_INTOPT(ip_qos_interactive); 1980 M_CP_INTOPT(ip_qos_interactive);
1979 M_CP_INTOPT(ip_qos_bulk); 1981 M_CP_INTOPT(ip_qos_bulk);
1980 M_CP_INTOPT(rekey_limit); 1982 M_CP_INTOPT(rekey_limit);