[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.113 and 1.114

version 1.113, 2003/06/26 20:08:33 version 1.114, 2003/07/03 08:09:05
Line 286 
Line 286 
         size_t len;          size_t len;
         u_short fwd_port, fwd_host_port;          u_short fwd_port, fwd_host_port;
         char sfwd_host_port[6];          char sfwd_host_port[6];
         extern int IPv4or6;  
   
         /* Strip trailing whitespace */          /* Strip trailing whitespace */
         for(len = strlen(line) - 1; len > 0; len--) {          for(len = strlen(line) - 1; len > 0; len--) {
Line 725 
Line 724 
   
         case oAddressFamily:          case oAddressFamily:
                 arg = strdelim(&s);                  arg = strdelim(&s);
                   intptr = &options->address_family;
                 if (strcasecmp(arg, "inet") == 0)                  if (strcasecmp(arg, "inet") == 0)
                         IPv4or6 = AF_INET;                          value = AF_INET;
                 else if (strcasecmp(arg, "inet6") == 0)                  else if (strcasecmp(arg, "inet6") == 0)
                         IPv4or6 = AF_INET6;                          value = AF_INET6;
                 else if (strcasecmp(arg, "any") == 0)                  else if (strcasecmp(arg, "any") == 0)
                         IPv4or6 = AF_UNSPEC;                          value = AF_UNSPEC;
                 else                  else
                         fatal("Unsupported AddressFamily \"%s\"", arg);                          fatal("Unsupported AddressFamily \"%s\"", arg);
                   if (*activep && *intptr == -1)
                           *intptr = value;
                 break;                  break;
   
         case oEnableSSHKeysign:          case oEnableSSHKeysign:
Line 837 
Line 839 
         options->keepalives = -1;          options->keepalives = -1;
         options->compression_level = -1;          options->compression_level = -1;
         options->port = -1;          options->port = -1;
           options->address_family = -1;
         options->connection_attempts = -1;          options->connection_attempts = -1;
         options->connection_timeout = -1;          options->connection_timeout = -1;
         options->number_of_password_prompts = -1;          options->number_of_password_prompts = -1;
Line 924 
Line 927 
                 options->compression_level = 6;                  options->compression_level = 6;
         if (options->port == -1)          if (options->port == -1)
                 options->port = 0;      /* Filled in ssh_connect. */                  options->port = 0;      /* Filled in ssh_connect. */
           if (options->address_family == -1)
                   options->address_family = AF_UNSPEC;
         if (options->connection_attempts == -1)          if (options->connection_attempts == -1)
                 options->connection_attempts = 1;                  options->connection_attempts = 1;
         if (options->number_of_password_prompts == -1)          if (options->number_of_password_prompts == -1)
Legend:
Removed from v.1.113  
changed lines
  Added in v.1.114