[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.191 and 1.192

version 1.191, 2011/05/06 21:31:38 version 1.192, 2011/05/06 21:34:32
Line 131 
Line 131 
         oHashKnownHosts,          oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,          oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,          oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oKexAlgorithms, oIPQoS,          oKexAlgorithms, oIPQoS, oRequestTTY,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 242 
Line 242 
 #endif  #endif
         { "kexalgorithms", oKexAlgorithms },          { "kexalgorithms", oKexAlgorithms },
         { "ipqos", oIPQoS },          { "ipqos", oIPQoS },
           { "requesttty", oRequestTTY },
   
         { NULL, oBadOption }          { NULL, oBadOption }
 };  };
Line 1009 
Line 1010 
                 intptr = &options->use_roaming;                  intptr = &options->use_roaming;
                 goto parse_flag;                  goto parse_flag;
   
           case oRequestTTY:
                   arg = strdelim(&s);
                   if (!arg || *arg == '\0')
                           fatal("%s line %d: missing argument.",
                               filename, linenum);
                   intptr = &options->request_tty;
                   if (strcasecmp(arg, "yes") == 0)
                           value = REQUEST_TTY_YES;
                   else if (strcasecmp(arg, "no") == 0)
                           value = REQUEST_TTY_NO;
                   else if (strcasecmp(arg, "force") == 0)
                           value = REQUEST_TTY_FORCE;
                   else if (strcasecmp(arg, "auto") == 0)
                           value = REQUEST_TTY_AUTO;
                   else
                           fatal("Unsupported RequestTTY \"%s\"", arg);
                   if (*activep && *intptr == -1)
                           *intptr = value;
                   break;
   
         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 1169 
Line 1190 
         options->zero_knowledge_password_authentication = -1;          options->zero_knowledge_password_authentication = -1;
         options->ip_qos_interactive = -1;          options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;          options->ip_qos_bulk = -1;
           options->request_tty = -1;
 }  }
   
 /*  /*
Line 1326 
Line 1348 
                 options->ip_qos_interactive = IPTOS_LOWDELAY;                  options->ip_qos_interactive = IPTOS_LOWDELAY;
         if (options->ip_qos_bulk == -1)          if (options->ip_qos_bulk == -1)
                 options->ip_qos_bulk = IPTOS_THROUGHPUT;                  options->ip_qos_bulk = IPTOS_THROUGHPUT;
           if (options->request_tty == -1)
                   options->request_tty = REQUEST_TTY_AUTO;
         /* options->local_command should not be set by default */          /* options->local_command should not be set by default */
         /* 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 */
Legend:
Removed from v.1.191  
changed lines
  Added in v.1.192