[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.229 and 1.230

version 1.229, 2015/01/26 03:04:45 version 1.230, 2015/01/30 11:43:14
Line 145 
Line 145 
         oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,          oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
         oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,          oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
         oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,          oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
         oFingerprintHash, oUpdateHostkeys,          oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
         oIgnoredUnknownOption, oDeprecated, oUnsupported          oIgnoredUnknownOption, oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 263 
Line 263 
         { "revokedhostkeys", oRevokedHostKeys },          { "revokedhostkeys", oRevokedHostKeys },
         { "fingerprinthash", oFingerprintHash },          { "fingerprinthash", oFingerprintHash },
         { "updatehostkeys", oUpdateHostkeys },          { "updatehostkeys", oUpdateHostkeys },
           { "hostbasedkeytypes", oHostbasedKeyTypes },
         { "ignoreunknown", oIgnoreUnknown },          { "ignoreunknown", oIgnoreUnknown },
   
         { NULL, oBadOption }          { NULL, oBadOption }
Line 1469 
Line 1470 
                 intptr = &options->update_hostkeys;                  intptr = &options->update_hostkeys;
                 goto parse_flag;                  goto parse_flag;
   
           case oHostbasedKeyTypes:
                   charptr = &options->hostbased_key_types;
                   arg = strdelim(&s);
                   if (!arg || *arg == '\0')
                           fatal("%.200s line %d: Missing argument.",
                               filename, linenum);
                   if (!sshkey_names_valid2(arg, 1))
                           fatal("%s line %d: Bad key types '%s'.",
                                   filename, linenum, arg ? arg : "<NONE>");
                   if (*activep && *charptr == NULL)
                           *charptr = xstrdup(arg);
                   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 1648 
Line 1662 
         options->revoked_host_keys = NULL;          options->revoked_host_keys = NULL;
         options->fingerprint_hash = -1;          options->fingerprint_hash = -1;
         options->update_hostkeys = -1;          options->update_hostkeys = -1;
           options->hostbased_key_types = NULL;
 }  }
   
 /*  /*
Line 1827 
Line 1842 
                 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;                  options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
         if (options->update_hostkeys == -1)          if (options->update_hostkeys == -1)
                 options->update_hostkeys = 1;                  options->update_hostkeys = 1;
           if (options->hostbased_key_types == NULL)
                   options->hostbased_key_types = xstrdup("*");
   
 #define CLEAR_ON_NONE(v) \  #define CLEAR_ON_NONE(v) \
         do { \          do { \
Line 2267 
Line 2284 
         dump_cfg_string(oControlPath, o->control_path);          dump_cfg_string(oControlPath, o->control_path);
         dump_cfg_string(oHostKeyAlgorithms, o->hostkeyalgorithms ? o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);          dump_cfg_string(oHostKeyAlgorithms, o->hostkeyalgorithms ? o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);
         dump_cfg_string(oHostKeyAlias, o->host_key_alias);          dump_cfg_string(oHostKeyAlias, o->host_key_alias);
           dump_cfg_string(oHostbasedKeyTypes, o->hostbased_key_types);
         dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices);          dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices);
         dump_cfg_string(oKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : KEX_CLIENT_KEX);          dump_cfg_string(oKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : KEX_CLIENT_KEX);
         dump_cfg_string(oLocalCommand, o->local_command);          dump_cfg_string(oLocalCommand, o->local_command);
Line 2275 
Line 2293 
         dump_cfg_string(oPKCS11Provider, o->pkcs11_provider);          dump_cfg_string(oPKCS11Provider, o->pkcs11_provider);
         dump_cfg_string(oPreferredAuthentications, o->preferred_authentications);          dump_cfg_string(oPreferredAuthentications, o->preferred_authentications);
         dump_cfg_string(oProxyCommand, o->proxy_command);          dump_cfg_string(oProxyCommand, o->proxy_command);
         dump_cfg_string(oXAuthLocation, o->xauth_location);  
         dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);          dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);
           dump_cfg_string(oXAuthLocation, o->xauth_location);
   
           /* Forwards */
         dump_cfg_forwards(oDynamicForward, o->num_local_forwards, o->local_forwards);          dump_cfg_forwards(oDynamicForward, o->num_local_forwards, o->local_forwards);
         dump_cfg_forwards(oLocalForward, o->num_local_forwards, o->local_forwards);          dump_cfg_forwards(oLocalForward, o->num_local_forwards, o->local_forwards);
         dump_cfg_forwards(oRemoteForward, o->num_remote_forwards, o->remote_forwards);          dump_cfg_forwards(oRemoteForward, o->num_remote_forwards, o->remote_forwards);
Legend:
Removed from v.1.229  
changed lines
  Added in v.1.230