diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2016-11-23 23:14:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-11-24 16:07:26 +1100 |
| commit | f0ddedee460486fa0e32fefb2950548009e5026e (patch) | |
| tree | 3b64b732c52f337ac830068110d46e2f5de0bc8c | |
| parent | 1a6f9d2e2493d445cd9ee496e6e3c2a2f283f66a (diff) | |
upstream commit
allow ClientAlive{Interval,CountMax} in Match; ok dtucker,
djm
Upstream-ID: 8beb4c1eadd588f1080b58932281983864979f55
| -rw-r--r-- | servconf.c | 8 | ||||
| -rw-r--r-- | sshd_config.5 | 6 |
2 files changed, 9 insertions, 5 deletions
@@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.299 2016/11/06 05:46:37 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.300 2016/11/23 23:14:15 markus Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -528,8 +528,8 @@ static struct { { "usedns", sUseDNS, SSHCFG_GLOBAL }, { "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL }, { "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL }, - { "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL }, - { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, + { "clientaliveinterval", sClientAliveInterval, SSHCFG_ALL }, + { "clientalivecountmax", sClientAliveCountMax, SSHCFG_ALL }, { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL }, { "authorizedkeysfile2", sDeprecated, SSHCFG_ALL }, { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL}, @@ -1975,6 +1975,8 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) M_CP_INTOPT(permit_user_rc); M_CP_INTOPT(max_sessions); M_CP_INTOPT(max_authtries); + M_CP_INTOPT(client_alive_count_max); + M_CP_INTOPT(client_alive_interval); M_CP_INTOPT(ip_qos_interactive); M_CP_INTOPT(ip_qos_bulk); M_CP_INTOPT(rekey_limit); diff --git a/sshd_config.5 b/sshd_config.5 index 82a3ad14..281de141 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,8 +33,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.237 2016/10/07 14:41:52 jmc Exp $ -.Dd $Mdocdate: October 7 2016 $ +.\" $OpenBSD: sshd_config.5,v 1.238 2016/11/23 23:14:15 markus Exp $ +.Dd $Mdocdate: November 23 2016 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -1045,6 +1045,8 @@ Available keywords are .Cm AuthorizedPrincipalsFile , .Cm Banner , .Cm ChrootDirectory , +.Cm ClientAliveCountMax , +.Cm ClientAliveInterval , .Cm DenyGroups , .Cm DenyUsers , .Cm ForceCommand , |