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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/ssh/sshd/servconf.c
          +++ new/usr/src/cmd/ssh/sshd/servconf.c
↓ open down ↓ 2 lines elided ↑ open up ↑
   3    3   *                    All rights reserved
   4    4   *
   5    5   * As far as I am concerned, the code I have written for this software
   6    6   * can be used freely for any purpose.  Any derived versions of this
   7    7   * software must be clearly marked as such, and if the derived work is
   8    8   * incompatible with the protocol description in the RFC file, it must be
   9    9   * called by a name other than "ssh" or "Secure Shell".
  10   10   */
  11   11  /*
  12   12   * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
       13 + * Copyright 2012 Joyent, Inc.  All rights reserved.
  13   14   */
  14   15  
  15   16  #include "includes.h"
  16   17  RCSID("$OpenBSD: servconf.c,v 1.115 2002/09/04 18:52:42 stevesk Exp $");
  17   18  
  18   19  #ifdef HAVE_DEFOPEN
  19   20  #include <deflt.h>
  20   21  #endif /* HAVE_DEFOPEN */
  21   22  
  22   23  #if defined(KRB4)
↓ open down ↓ 473 lines elided ↑ open up ↑
 496  497          { "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL },
 497  498          { "x11forwarding", sX11Forwarding, SSHCFG_ALL },
 498  499          { "x11displayoffset", sX11DisplayOffset, SSHCFG_ALL },
 499  500          { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
 500  501          { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
 501  502          { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
 502  503          { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
 503  504          { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
 504  505          { "uselogin", sUseLogin, SSHCFG_GLOBAL },
 505  506          { "compression", sCompression, SSHCFG_GLOBAL },
 506      -        { "keepalive", sKeepAlives, SSHCFG_GLOBAL },
      507 +        { "tcpkeepalive", sKeepAlives, SSHCFG_GLOBAL },
      508 +        { "keepalive", sKeepAlives, SSHCFG_GLOBAL },            /* obsolete */
 507  509          { "allowtcpforwarding", sAllowTcpForwarding, SSHCFG_ALL },
 508  510          { "allowusers", sAllowUsers, SSHCFG_GLOBAL },
 509  511          { "denyusers", sDenyUsers, SSHCFG_GLOBAL },
 510  512          { "allowgroups", sAllowGroups, SSHCFG_GLOBAL },
 511  513          { "denygroups", sDenyGroups, SSHCFG_GLOBAL },
 512  514          { "ciphers", sCiphers, SSHCFG_GLOBAL },
 513  515          { "macs", sMacs, SSHCFG_GLOBAL},
 514  516          { "protocol", sProtocol,SSHCFG_GLOBAL },
 515  517          { "gatewayports", sGatewayPorts, SSHCFG_ALL },
 516  518          { "subsystem", sSubsystem, SSHCFG_GLOBAL},
↓ open down ↓ 983 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX