[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.176 and 1.177

version 1.176, 2009/02/12 03:00:56 version 1.177, 2009/06/27 09:35:06
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, oZeroKnowledgePasswordAuthentication,          oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 225 
Line 225 
         { "localcommand", oLocalCommand },          { "localcommand", oLocalCommand },
         { "permitlocalcommand", oPermitLocalCommand },          { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },          { "visualhostkey", oVisualHostKey },
           { "useroaming", oUseRoaming },
 #ifdef JPAKE  #ifdef JPAKE
         { "zeroknowledgepasswordauthentication",          { "zeroknowledgepasswordauthentication",
             oZeroKnowledgePasswordAuthentication },              oZeroKnowledgePasswordAuthentication },
Line 909 
Line 910 
                 intptr = &options->visual_host_key;                  intptr = &options->visual_host_key;
                 goto parse_flag;                  goto parse_flag;
   
           case oUseRoaming:
                   intptr = &options->use_roaming;
                   goto parse_flag;
   
         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 1058 
Line 1063 
         options->tun_remote = -1;          options->tun_remote = -1;
         options->local_command = NULL;          options->local_command = NULL;
         options->permit_local_command = -1;          options->permit_local_command = -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;
 }  }
Line 1194 
Line 1200 
                 options->tun_remote = SSH_TUNID_ANY;                  options->tun_remote = SSH_TUNID_ANY;
         if (options->permit_local_command == -1)          if (options->permit_local_command == -1)
                 options->permit_local_command = 0;                  options->permit_local_command = 0;
           if (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)          if (options->zero_knowledge_password_authentication == -1)

Legend:
Removed from v.1.176  
changed lines
  Added in v.1.177