[BACK]Return to readconf.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/readconf.c between version 1.125 and 1.126

version 1.125, 2003/11/12 16:39:58 version 1.126, 2003/12/09 21:53:36
Line 78 
Line 78 
      RSAAuthentication yes       RSAAuthentication yes
      RhostsRSAAuthentication yes       RhostsRSAAuthentication yes
      StrictHostKeyChecking yes       StrictHostKeyChecking yes
      KeepAlives no       TcpKeepAlive no
      IdentityFile ~/.ssh/identity       IdentityFile ~/.ssh/identity
      Port 22       Port 22
      EscapeChar ~       EscapeChar ~
Line 96 
Line 96 
         oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,          oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,          oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
         oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,          oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
         oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts,          oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts,
         oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs,          oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs,
         oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication,          oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication,
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,          oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
Line 169 
Line 169 
         { "stricthostkeychecking", oStrictHostKeyChecking },          { "stricthostkeychecking", oStrictHostKeyChecking },
         { "compression", oCompression },          { "compression", oCompression },
         { "compressionlevel", oCompressionLevel },          { "compressionlevel", oCompressionLevel },
         { "keepalive", oKeepAlives },          { "tcpkeepalive", oTCPKeepAlive },
           { "keepalive", oTCPKeepAlive },                         /* obsolete */
         { "numberofpasswordprompts", oNumberOfPasswordPrompts },          { "numberofpasswordprompts", oNumberOfPasswordPrompts },
         { "loglevel", oLogLevel },          { "loglevel", oLogLevel },
         { "dynamicforward", oDynamicForward },          { "dynamicforward", oDynamicForward },
Line 425 
Line 426 
                 intptr = &options->compression;                  intptr = &options->compression;
                 goto parse_flag;                  goto parse_flag;
   
         case oKeepAlives:          case oTCPKeepAlive:
                 intptr = &options->keepalives;                  intptr = &options->tcp_keep_alive;
                 goto parse_flag;                  goto parse_flag;
   
         case oNoHostAuthenticationForLocalhost:          case oNoHostAuthenticationForLocalhost:
Line 824 
Line 825 
         options->check_host_ip = -1;          options->check_host_ip = -1;
         options->strict_host_key_checking = -1;          options->strict_host_key_checking = -1;
         options->compression = -1;          options->compression = -1;
         options->keepalives = -1;          options->tcp_keep_alive = -1;
         options->compression_level = -1;          options->compression_level = -1;
         options->port = -1;          options->port = -1;
         options->address_family = -1;          options->address_family = -1;
Line 907 
Line 908 
                 options->strict_host_key_checking = 2;  /* 2 is default */                  options->strict_host_key_checking = 2;  /* 2 is default */
         if (options->compression == -1)          if (options->compression == -1)
                 options->compression = 0;                  options->compression = 0;
         if (options->keepalives == -1)          if (options->tcp_keep_alive == -1)
                 options->keepalives = 1;                  options->tcp_keep_alive = 1;
         if (options->compression_level == -1)          if (options->compression_level == -1)
                 options->compression_level = 6;                  options->compression_level = 6;
         if (options->port == -1)          if (options->port == -1)
Legend:
Removed from v.1.125  
changed lines
  Added in v.1.126