Print this page
3477 SunSSH config should accept TCPKeepAlive as synonym for KeepAlive
Reviewed by: Jerry Jelinek <jerry@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/ssh/libssh/common/readconf.c
          +++ new/usr/src/cmd/ssh/libssh/common/readconf.c
↓ open down ↓ 5 lines elided ↑ open up ↑
   6    6   *
   7    7   * As far as I am concerned, the code I have written for this software
   8    8   * can be used freely for any purpose.  Any derived versions of this
   9    9   * software must be clearly marked as such, and if the derived work is
  10   10   * incompatible with the protocol description in the RFC file, it must be
  11   11   * called by a name other than "ssh" or "Secure Shell".
  12   12   */
  13   13  /*
  14   14   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  15   15   * Use is subject to license terms.
       16 + * Copyright 2013 Joyent, Inc.  All rights reserved.
  16   17   */
  17   18  
  18   19  #include "includes.h"
  19   20  RCSID("$OpenBSD: readconf.c,v 1.100 2002/06/19 00:27:55 deraadt Exp $");
  20   21  
  21   22  #include "ssh.h"
  22   23  #include "xmalloc.h"
  23   24  #include "compat.h"
  24   25  #include "cipher.h"
  25   26  #include "pathnames.h"
↓ open down ↓ 171 lines elided ↑ open up ↑
 197  198          { "globalknownhostsfile", oGlobalKnownHostsFile },
 198  199          { "userknownhostsfile", oUserKnownHostsFile },          /* obsolete */
 199  200          { "globalknownhostsfile2", oGlobalKnownHostsFile2 },
 200  201          { "userknownhostsfile2", oUserKnownHostsFile2 },        /* obsolete */
 201  202          { "connectionattempts", oConnectionAttempts },
 202  203          { "batchmode", oBatchMode },
 203  204          { "checkhostip", oCheckHostIP },
 204  205          { "stricthostkeychecking", oStrictHostKeyChecking },
 205  206          { "compression", oCompression },
 206  207          { "compressionlevel", oCompressionLevel },
 207      -        { "keepalive", oKeepAlives },
      208 +        { "tcpkeepalive", oKeepAlives },
      209 +        { "keepalive", oKeepAlives },                           /* obsolete */
 208  210          { "numberofpasswordprompts", oNumberOfPasswordPrompts },
 209  211          { "loglevel", oLogLevel },
 210  212          { "dynamicforward", oDynamicForward },
 211  213          { "preferredauthentications", oPreferredAuthentications },
 212  214          { "hostkeyalgorithms", oHostKeyAlgorithms },
 213  215          { "bindaddress", oBindAddress },
 214  216          { "smartcarddevice", oSmartcardDevice },
 215  217          { "clearallforwardings", oClearAllForwardings },
 216  218          { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
 217  219          { "rekeylimit", oRekeyLimit },
↓ open down ↓ 1057 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX