[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.170 and 1.171

version 1.170, 2008/11/03 02:44:41 version 1.171, 2008/11/04 08:22: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,          oVisualHostKey, oZeroKnowledgePasswordAuthentication,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 225 
Line 225 
         { "localcommand", oLocalCommand },          { "localcommand", oLocalCommand },
         { "permitlocalcommand", oPermitLocalCommand },          { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },          { "visualhostkey", oVisualHostKey },
   #ifdef JPAKE
           { "zeroknowledgepasswordauthentication",
               oZeroKnowledgePasswordAuthentication },
   #else
           { "zeroknowledgepasswordauthentication", oUnsupported },
   #endif
   
         { NULL, oBadOption }          { NULL, oBadOption }
 };  };
   
Line 407 
Line 414 
                 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 1049 
Line 1060 
         options->local_command = NULL;          options->local_command = NULL;
         options->permit_local_command = -1;          options->permit_local_command = -1;
         options->visual_host_key = -1;          options->visual_host_key = -1;
           options->zero_knowledge_password_authentication = -1;
 }  }
   
 /*  /*
Line 1185 
Line 1197 
                 options->permit_local_command = 0;                  options->permit_local_command = 0;
         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;
         /* 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.170  
changed lines
  Added in v.1.171