[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.126 and 1.127

version 1.126, 2003/12/09 21:53:36 version 1.127, 2003/12/16 15:49:51
Line 105 
Line 105 
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,          oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,          oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,          oAddressFamily, oGssAuthentication, oGssDelegateCreds,
           oServerAliveInterval, oServerAliveCountMax,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 189 
Line 190 
         { "rekeylimit", oRekeyLimit },          { "rekeylimit", oRekeyLimit },
         { "connecttimeout", oConnectTimeout },          { "connecttimeout", oConnectTimeout },
         { "addressfamily", oAddressFamily },          { "addressfamily", oAddressFamily },
           { "serveraliveinterval", oServerAliveInterval },
           { "serveralivecountmax", oServerAliveCountMax },
         { NULL, oBadOption }          { NULL, oBadOption }
 };  };
   
Line 305 
Line 308 
                 /* NOTREACHED */                  /* NOTREACHED */
         case oConnectTimeout:          case oConnectTimeout:
                 intptr = &options->connection_timeout;                  intptr = &options->connection_timeout;
 /* parse_time: */  parse_time:
                 arg = strdelim(&s);                  arg = strdelim(&s);
                 if (!arg || *arg == '\0')                  if (!arg || *arg == '\0')
                         fatal("%s line %d: missing time value.",                          fatal("%s line %d: missing time value.",
Line 731 
Line 734 
                 intptr = &options->enable_ssh_keysign;                  intptr = &options->enable_ssh_keysign;
                 goto parse_flag;                  goto parse_flag;
   
           case oServerAliveInterval:
                   intptr = &options->server_alive_interval;
                   goto parse_time;
   
           case oServerAliveCountMax:
                   intptr = &options->server_alive_count_max;
                   goto parse_int;
   
         case oDeprecated:          case oDeprecated:
                 debug("%s line %d: Deprecated option \"%s\"",                  debug("%s line %d: Deprecated option \"%s\"",
                     filename, linenum, keyword);                      filename, linenum, keyword);
Line 858 
Line 869 
         options->no_host_authentication_for_localhost = - 1;          options->no_host_authentication_for_localhost = - 1;
         options->rekey_limit = - 1;          options->rekey_limit = - 1;
         options->verify_host_key_dns = -1;          options->verify_host_key_dns = -1;
           options->server_alive_interval = -1;
           options->server_alive_count_max = -1;
 }  }
   
 /*  /*
Line 972 
Line 985 
                 options->rekey_limit = 0;                  options->rekey_limit = 0;
         if (options->verify_host_key_dns == -1)          if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;                  options->verify_host_key_dns = 0;
           if (options->server_alive_interval == -1)
                   options->server_alive_interval = 0;
           if (options->server_alive_count_max == -1)
                   options->server_alive_count_max = 3;
         /* options->proxy_command should not be set by default */          /* options->proxy_command should not be set by default */
         /* options->user will be set in the main program if appropriate */          /* options->user will be set in the main program if appropriate */
         /* options->hostname will be set in the main program if appropriate */          /* options->hostname will be set in the main program if appropriate */
Legend:
Removed from v.1.126  
changed lines
  Added in v.1.127