diff options
| author | Joshua M. Clulow <jmc@joyent.com> | 2013-01-17 20:18:59 -0800 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2013-01-17 20:20:19 -0800 |
| commit | 33c41f2b7f5e60517664bd7f392221865f833526 (patch) | |
| tree | 36145f32d927fbb559722e32e96c7f28c9e0f245 /usr/src/cmd/ssh/sshd | |
| parent | 3c1e517454d5ef05eda14277b3af58472e9b26a9 (diff) | |
| download | illumos-joyent-33c41f2b7f5e60517664bd7f392221865f833526.tar.gz | |
3477 SunSSH config should accept TCPKeepAlive as synonym for KeepAlive
Reviewed by: Jerry Jelinek <jerry@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/cmd/ssh/sshd')
| -rw-r--r-- | usr/src/cmd/ssh/sshd/servconf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/cmd/ssh/sshd/servconf.c b/usr/src/cmd/ssh/sshd/servconf.c index ccd78de9b9..516466bbc1 100644 --- a/usr/src/cmd/ssh/sshd/servconf.c +++ b/usr/src/cmd/ssh/sshd/servconf.c @@ -10,6 +10,7 @@ */ /* * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2013 Joyent, Inc. All rights reserved. */ #include "includes.h" @@ -501,7 +502,8 @@ static struct { { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, { "uselogin", sUseLogin, SSHCFG_GLOBAL }, { "compression", sCompression, SSHCFG_GLOBAL }, - { "keepalive", sKeepAlives, SSHCFG_GLOBAL }, + { "tcpkeepalive", sKeepAlives, SSHCFG_GLOBAL }, + { "keepalive", sKeepAlives, SSHCFG_GLOBAL }, /* obsolete */ { "allowtcpforwarding", sAllowTcpForwarding, SSHCFG_ALL }, { "allowusers", sAllowUsers, SSHCFG_GLOBAL }, { "denyusers", sDenyUsers, SSHCFG_GLOBAL }, |