[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.245 and 1.246

version 1.245, 2015/10/27 08:54:52 version 1.246, 2015/11/15 22:26:49
Line 124 
Line 124 
         oPasswordAuthentication, oRSAAuthentication,          oPasswordAuthentication, oRSAAuthentication,
         oChallengeResponseAuthentication, oXAuthLocation,          oChallengeResponseAuthentication, oXAuthLocation,
         oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,          oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
         oCertificateFile,          oCertificateFile, oAddKeysToAgent,
         oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,          oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,          oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
         oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,          oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
Line 193 
Line 193 
         { "identityfile2", oIdentityFile },                     /* obsolete */          { "identityfile2", oIdentityFile },                     /* obsolete */
         { "identitiesonly", oIdentitiesOnly },          { "identitiesonly", oIdentitiesOnly },
         { "certificatefile", oCertificateFile },          { "certificatefile", oCertificateFile },
           { "addkeystoagent", oAddKeysToAgent },
         { "hostname", oHostName },          { "hostname", oHostName },
         { "hostkeyalias", oHostKeyAlias },          { "hostkeyalias", oHostKeyAlias },
         { "proxycommand", oProxyCommand },          { "proxycommand", oProxyCommand },
Line 700 
Line 701 
         { "ask",                        2 },          { "ask",                        2 },
         { NULL, -1 }          { NULL, -1 }
 };  };
   static const struct multistate multistate_yesnoaskconfirm[] = {
           { "true",                       1 },
           { "false",                      0 },
           { "yes",                        1 },
           { "no",                         0 },
           { "ask",                        2 },
           { "confirm",                    3 },
           { NULL, -1 }
   };
 static const struct multistate multistate_addressfamily[] = {  static const struct multistate multistate_addressfamily[] = {
         { "inet",                       AF_INET },          { "inet",                       AF_INET },
         { "inet6",                      AF_INET6 },          { "inet6",                      AF_INET6 },
Line 1521 
Line 1531 
                 charptr = &options->pubkey_key_types;                  charptr = &options->pubkey_key_types;
                 goto parse_keytypes;                  goto parse_keytypes;
   
           case oAddKeysToAgent:
                   intptr = &options->add_keys_to_agent;
                   multistate_ptr = multistate_yesnoaskconfirm;
                   goto parse_multistate;
   
         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 1687 
Line 1702 
         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->add_keys_to_agent = -1;
         options->visual_host_key = -1;          options->visual_host_key = -1;
         options->ip_qos_interactive = -1;          options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;          options->ip_qos_bulk = -1;
Line 1791 
Line 1807 
         /* options->hostkeyalgorithms, default set in myproposals.h */          /* options->hostkeyalgorithms, default set in myproposals.h */
         if (options->protocol == SSH_PROTO_UNKNOWN)          if (options->protocol == SSH_PROTO_UNKNOWN)
                 options->protocol = SSH_PROTO_2;                  options->protocol = SSH_PROTO_2;
           if (options->add_keys_to_agent == -1)
                   options->add_keys_to_agent = 0;
         if (options->num_identity_files == 0) {          if (options->num_identity_files == 0) {
                 if (options->protocol & SSH_PROTO_1) {                  if (options->protocol & SSH_PROTO_1) {
                         add_identity_file(options, "~/",                          add_identity_file(options, "~/",
Legend:
Removed from v.1.245  
changed lines
  Added in v.1.246