[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.181 and 1.182

version 1.181, 2009/12/29 16:38:41 version 1.182, 2010/01/09 23:04:13
Line 127 
Line 127 
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,          oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,          oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,          oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oVisualHostKey, oUseRoaming, oRDomain,          oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oZeroKnowledgePasswordAuthentication, oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
 /* Textual representations of the tokens. */  /* Textual representations of the tokens. */
Line 226 
Line 226 
         { "permitlocalcommand", oPermitLocalCommand },          { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },          { "visualhostkey", oVisualHostKey },
         { "useroaming", oUseRoaming },          { "useroaming", oUseRoaming },
         { "routingdomain", oRDomain },  
 #ifdef JPAKE  #ifdef JPAKE
         { "zeroknowledgepasswordauthentication",          { "zeroknowledgepasswordauthentication",
             oZeroKnowledgePasswordAuthentication },              oZeroKnowledgePasswordAuthentication },
Line 915 
Line 914 
                 intptr = &options->use_roaming;                  intptr = &options->use_roaming;
                 goto parse_flag;                  goto parse_flag;
   
         case oRDomain:  
                 arg = strdelim(&s);  
                 if (!arg || *arg == '\0')  
                         fatal("%.200s line %d: Missing argument.",  
                             filename, linenum);  
                 value = a2rdomain(arg);  
                 if (value == -1)  
                         fatal("%.200s line %d: Bad rdomain.",  
                             filename, linenum);  
                 if (*activep)  
                         options->rdomain = 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 1078 
Line 1064 
         options->local_command = NULL;          options->local_command = NULL;
         options->permit_local_command = -1;          options->permit_local_command = -1;
         options->use_roaming = -1;          options->use_roaming = -1;
         options->rdomain = -1;  
         options->visual_host_key = -1;          options->visual_host_key = -1;
         options->zero_knowledge_password_authentication = -1;          options->zero_knowledge_password_authentication = -1;
 }  }
Line 1227 
Line 1212 
         /* options->hostname will be set in the main program if appropriate */          /* options->hostname will be set in the main program if appropriate */
         /* options->host_key_alias should not be set by default */          /* options->host_key_alias should not be set by default */
         /* options->preferred_authentications will be set in ssh */          /* options->preferred_authentications will be set in ssh */
         /* options->rdomain should not be set by default */  
 }  }
   
 /*  /*
Legend:
Removed from v.1.181  
changed lines
  Added in v.1.182