[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.131 and 1.132

version 1.131, 2004/05/27 00:50:13 version 1.132, 2004/06/13 15:03:02
Line 106 
Line 106 
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,          oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,          oAddressFamily, oGssAuthentication, oGssDelegateCreds,
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,          oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv,          oSendEnv, oControlPath, oControlMaster,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 195 
Line 195 
         { "serveraliveinterval", oServerAliveInterval },          { "serveraliveinterval", oServerAliveInterval },
         { "serveralivecountmax", oServerAliveCountMax },          { "serveralivecountmax", oServerAliveCountMax },
         { "sendenv", oSendEnv },          { "sendenv", oSendEnv },
           { "controlpath", oControlPath },
           { "controlmaster", oControlMaster },
         { NULL, oBadOption }          { NULL, oBadOption }
 };  };
   
Line 762 
Line 764 
                 }                  }
                 break;                  break;
   
           case oControlPath:
                   charptr = &options->control_path;
                   goto parse_string;
   
           case oControlMaster:
                   intptr = &options->control_master;
                   goto parse_flag;
   
         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 903 
Line 913 
         options->server_alive_interval = -1;          options->server_alive_interval = -1;
         options->server_alive_count_max = -1;          options->server_alive_count_max = -1;
         options->num_send_env = 0;          options->num_send_env = 0;
           options->control_path = NULL;
           options->control_master = -1;
 }  }
   
 /*  /*
Line 1023 
Line 1035 
                 options->server_alive_interval = 0;                  options->server_alive_interval = 0;
         if (options->server_alive_count_max == -1)          if (options->server_alive_count_max == -1)
                 options->server_alive_count_max = 3;                  options->server_alive_count_max = 3;
           if (options->control_master == -1)
                   options->control_master = 0;
         /* 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.131  
changed lines
  Added in v.1.132