[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.189 and 1.190

version 1.189, 2010/09/22 05:01:29 version 1.190, 2010/11/13 23:27:50
Line 17 
Line 17 
 #include <sys/socket.h>  #include <sys/socket.h>
   
 #include <netinet/in.h>  #include <netinet/in.h>
   #include <netinet/in_systm.h>
   #include <netinet/ip.h>
   
 #include <ctype.h>  #include <ctype.h>
 #include <errno.h>  #include <errno.h>
Line 129 
Line 131 
         oHashKnownHosts,          oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,          oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,          oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oKexAlgorithms,          oKexAlgorithms, oIPQoS,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 239 
Line 241 
         { "zeroknowledgepasswordauthentication", oUnsupported },          { "zeroknowledgepasswordauthentication", oUnsupported },
 #endif  #endif
         { "kexalgorithms", oKexAlgorithms },          { "kexalgorithms", oKexAlgorithms },
           { "ipqos", oIPQoS },
   
         { NULL, oBadOption }          { NULL, oBadOption }
 };  };
Line 969 
Line 972 
                 intptr = &options->visual_host_key;                  intptr = &options->visual_host_key;
                 goto parse_flag;                  goto parse_flag;
   
           case oIPQoS:
                   arg = strdelim(&s);
                   if ((value = parse_ipqos(arg)) == -1)
                           fatal("%s line %d: Bad IPQoS value: %s",
                               filename, linenum, arg);
                   arg = strdelim(&s);
                   if (arg == NULL)
                           value2 = value;
                   else if ((value2 = parse_ipqos(arg)) == -1)
                           fatal("%s line %d: Bad IPQoS value: %s",
                               filename, linenum, arg);
                   if (*activep) {
                           options->ip_qos_interactive = value;
                           options->ip_qos_bulk = value2;
                   }
                   break;
   
         case oUseRoaming:          case oUseRoaming:
                 intptr = &options->use_roaming;                  intptr = &options->use_roaming;
                 goto parse_flag;                  goto parse_flag;
Line 1131 
Line 1151 
         options->use_roaming = -1;          options->use_roaming = -1;
         options->visual_host_key = -1;          options->visual_host_key = -1;
         options->zero_knowledge_password_authentication = -1;          options->zero_knowledge_password_authentication = -1;
           options->ip_qos_interactive = -1;
           options->ip_qos_bulk = -1;
 }  }
   
 /*  /*
Line 1284 
Line 1306 
                 options->visual_host_key = 0;                  options->visual_host_key = 0;
         if (options->zero_knowledge_password_authentication == -1)          if (options->zero_knowledge_password_authentication == -1)
                 options->zero_knowledge_password_authentication = 0;                  options->zero_knowledge_password_authentication = 0;
           if (options->ip_qos_interactive == -1)
                   options->ip_qos_interactive = IPTOS_LOWDELAY;
           if (options->ip_qos_bulk == -1)
                   options->ip_qos_bulk = IPTOS_THROUGHPUT;
         /* 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.189  
changed lines
  Added in v.1.190