OS-1282 smartos' OpenSSH "KeepAlive" config var differs from "TCPKeepAlive" name in current OpenSSH

@@ -8,10 +8,11 @@
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  */
 /*
  * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2012 Joyent, Inc.  All rights reserved.
  */
 
 #include "includes.h"
 RCSID("$OpenBSD: servconf.c,v 1.115 2002/09/04 18:52:42 stevesk Exp $");
 

@@ -501,11 +502,12 @@
         { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
         { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
         { "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 },
         { "allowgroups", sAllowGroups, SSHCFG_GLOBAL },
         { "denygroups", sDenyGroups, SSHCFG_GLOBAL },