[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.186 and 1.187

version 1.186, 2010/06/25 23:15:36 version 1.187, 2010/07/19 09:15:12
Line 125 
Line 125 
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,          oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,          oAddressFamily, oGssAuthentication, oGssDelegateCreds,
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,          oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,          oSendEnv, oControlPath, oControlMaster, oControlPersist,
           oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,          oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,          oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
Line 222 
Line 223 
         { "sendenv", oSendEnv },          { "sendenv", oSendEnv },
         { "controlpath", oControlPath },          { "controlpath", oControlPath },
         { "controlmaster", oControlMaster },          { "controlmaster", oControlMaster },
           { "controlpersist", oControlPersist },
         { "hashknownhosts", oHashKnownHosts },          { "hashknownhosts", oHashKnownHosts },
         { "tunnel", oTunnel },          { "tunnel", oTunnel },
         { "tunneldevice", oTunnelDevice },          { "tunneldevice", oTunnelDevice },
Line 878 
Line 880 
                         *intptr = value;                          *intptr = value;
                 break;                  break;
   
           case oControlPersist:
                   /* no/false/yes/true, or a time spec */
                   intptr = &options->control_persist;
                   arg = strdelim(&s);
                   if (!arg || *arg == '\0')
                           fatal("%.200s line %d: Missing ControlPersist"
                               " argument.", filename, linenum);
                   value = 0;
                   value2 = 0;     /* timeout */
                   if (strcmp(arg, "no") == 0 || strcmp(arg, "false") == 0)
                           value = 0;
                   else if (strcmp(arg, "yes") == 0 || strcmp(arg, "true") == 0)
                           value = 1;
                   else if ((value2 = convtime(arg)) >= 0)
                           value = 1;
                   else
                           fatal("%.200s line %d: Bad ControlPersist argument.",
                               filename, linenum);
                   if (*activep && *intptr == -1) {
                           *intptr = value;
                           options->control_persist_timeout = value2;
                   }
                   break;
   
         case oHashKnownHosts:          case oHashKnownHosts:
                 intptr = &options->hash_known_hosts;                  intptr = &options->hash_known_hosts;
                 goto parse_flag;                  goto parse_flag;
Line 1079 
Line 1105 
         options->num_send_env = 0;          options->num_send_env = 0;
         options->control_path = NULL;          options->control_path = NULL;
         options->control_master = -1;          options->control_master = -1;
           options->control_persist = -1;
           options->control_persist_timeout = 0;
         options->hash_known_hosts = -1;          options->hash_known_hosts = -1;
         options->tun_open = -1;          options->tun_open = -1;
         options->tun_local = -1;          options->tun_local = -1;
Line 1214 
Line 1242 
                 options->server_alive_count_max = 3;                  options->server_alive_count_max = 3;
         if (options->control_master == -1)          if (options->control_master == -1)
                 options->control_master = 0;                  options->control_master = 0;
           if (options->control_persist == -1) {
                   options->control_persist = 0;
                   options->control_persist_timeout = 0;
           }
         if (options->hash_known_hosts == -1)          if (options->hash_known_hosts == -1)
                 options->hash_known_hosts = 0;                  options->hash_known_hosts = 0;
         if (options->tun_open == -1)          if (options->tun_open == -1)
Legend:
Removed from v.1.186  
changed lines
  Added in v.1.187