diff options
| author |   markus <markus@openbsd.org> | 2016-11-23 23:14:15 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2016-11-23 23:14:15 +0000 |
| commit | 9787dcbd303e1d5e2f98dea8e4c61823bf010c55 (patch) | |
| tree | 7f35ade90cdf421e245e95bea918b621e3112448 | |
| parent | Clean up some abuse of the .Va macro to achieve a visual effect: omit it or (diff) | |
| download | wireguard-openbsd-9787dcbd303e1d5e2f98dea8e4c61823bf010c55.tar.xz wireguard-openbsd-9787dcbd303e1d5e2f98dea8e4c61823bf010c55.zip | |
allow ClientAlive{Interval,CountMax} in Match; ok dtucker, djm
| -rw-r--r-- | usr.bin/ssh/servconf.c | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 65240787067..2a3c5d3dc9c 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -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 @@ -482,8 +482,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}, @@ -1923,6 +1923,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/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index ae490d7ee5b..d5dff472867 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/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 @@ -1046,6 +1046,8 @@ Available keywords are .Cm AuthorizedPrincipalsFile , .Cm Banner , .Cm ChrootDirectory , +.Cm ClientAliveCountMax , +.Cm ClientAliveInterval , .Cm DenyGroups , .Cm DenyUsers , .Cm ForceCommand , |