[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.215 and 1.216

version 1.215, 2013/12/06 13:39:49 version 1.216, 2014/01/29 06:18:35
Line 137 
Line 137 
         oSendEnv, oControlPath, oControlMaster, oControlPersist,          oSendEnv, oControlPath, oControlMaster, oControlPersist,
         oHashKnownHosts,          oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,          oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,          oVisualHostKey, oUseRoaming,
         oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,          oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
         oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,          oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
         oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,          oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
Line 244 
Line 244 
         { "permitlocalcommand", oPermitLocalCommand },          { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },          { "visualhostkey", oVisualHostKey },
         { "useroaming", oUseRoaming },          { "useroaming", oUseRoaming },
 #ifdef JPAKE  
         { "zeroknowledgepasswordauthentication",  
             oZeroKnowledgePasswordAuthentication },  
 #else  
         { "zeroknowledgepasswordauthentication", oUnsupported },  
 #endif  
         { "kexalgorithms", oKexAlgorithms },          { "kexalgorithms", oKexAlgorithms },
         { "ipqos", oIPQoS },          { "ipqos", oIPQoS },
         { "requesttty", oRequestTTY },          { "requesttty", oRequestTTY },
Line 795 
Line 789 
                 intptr = &options->password_authentication;                  intptr = &options->password_authentication;
                 goto parse_flag;                  goto parse_flag;
   
         case oZeroKnowledgePasswordAuthentication:  
                 intptr = &options->zero_knowledge_password_authentication;  
                 goto parse_flag;  
   
         case oKbdInteractiveAuthentication:          case oKbdInteractiveAuthentication:
                 intptr = &options->kbd_interactive_authentication;                  intptr = &options->kbd_interactive_authentication;
                 goto parse_flag;                  goto parse_flag;
Line 1541 
Line 1531 
         options->permit_local_command = -1;          options->permit_local_command = -1;
         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->ip_qos_interactive = -1;          options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;          options->ip_qos_bulk = -1;
         options->request_tty = -1;          options->request_tty = -1;
Line 1695 
Line 1684 
                 options->use_roaming = 1;                  options->use_roaming = 1;
         if (options->visual_host_key == -1)          if (options->visual_host_key == -1)
                 options->visual_host_key = 0;                  options->visual_host_key = 0;
         if (options->zero_knowledge_password_authentication == -1)  
                 options->zero_knowledge_password_authentication = 0;  
         if (options->ip_qos_interactive == -1)          if (options->ip_qos_interactive == -1)
                 options->ip_qos_interactive = IPTOS_LOWDELAY;                  options->ip_qos_interactive = IPTOS_LOWDELAY;
         if (options->ip_qos_bulk == -1)          if (options->ip_qos_bulk == -1)
Legend:
Removed from v.1.215  
changed lines
  Added in v.1.216