[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.345 and 1.346

version 1.345, 2020/12/21 09:19:53 version 1.346, 2020/12/22 00:15:22
Line 158 
Line 158 
         oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,          oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
         oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,          oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
         oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump,          oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump,
         oSecurityKeyProvider,          oSecurityKeyProvider, oKnownHostsCommand,
         oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported          oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 297 
Line 297 
         { "ignoreunknown", oIgnoreUnknown },          { "ignoreunknown", oIgnoreUnknown },
         { "proxyjump", oProxyJump },          { "proxyjump", oProxyJump },
         { "securitykeyprovider", oSecurityKeyProvider },          { "securitykeyprovider", oSecurityKeyProvider },
           { "knownhostscommand", oKnownHostsCommand },
   
         { NULL, oBadOption }          { NULL, oBadOption }
 };  };
Line 1240 
Line 1241 
                 charptr = &options->sk_provider;                  charptr = &options->sk_provider;
                 goto parse_string;                  goto parse_string;
   
           case oKnownHostsCommand:
                   charptr = &options->known_hosts_command;
                   goto parse_command;
   
         case oProxyCommand:          case oProxyCommand:
                 charptr = &options->proxy_command;                  charptr = &options->proxy_command;
                 /* Ignore ProxyCommand if ProxyJump already specified */                  /* Ignore ProxyCommand if ProxyJump already specified */
Line 2203 
Line 2208 
         options->update_hostkeys = -1;          options->update_hostkeys = -1;
         options->hostbased_key_types = NULL;          options->hostbased_key_types = NULL;
         options->pubkey_key_types = NULL;          options->pubkey_key_types = NULL;
           options->known_hosts_command = NULL;
 }  }
   
 /*  /*
Line 2431 
Line 2437 
         CLEAR_ON_NONE(options->revoked_host_keys);          CLEAR_ON_NONE(options->revoked_host_keys);
         CLEAR_ON_NONE(options->pkcs11_provider);          CLEAR_ON_NONE(options->pkcs11_provider);
         CLEAR_ON_NONE(options->sk_provider);          CLEAR_ON_NONE(options->sk_provider);
           CLEAR_ON_NONE(options->known_hosts_command);
         if (options->jump_host != NULL &&          if (options->jump_host != NULL &&
             strcmp(options->jump_host, "none") == 0 &&              strcmp(options->jump_host, "none") == 0 &&
             options->jump_port == 0 && options->jump_user == NULL) {              options->jump_port == 0 && options->jump_user == NULL) {
Line 3079 
Line 3086 
         dump_cfg_string(oPubkeyAcceptedKeyTypes, o->pubkey_key_types);          dump_cfg_string(oPubkeyAcceptedKeyTypes, o->pubkey_key_types);
         dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);          dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);
         dump_cfg_string(oXAuthLocation, o->xauth_location);          dump_cfg_string(oXAuthLocation, o->xauth_location);
           dump_cfg_string(oKnownHostsCommand, o->known_hosts_command);
   
         /* Forwards */          /* Forwards */
         dump_cfg_forwards(oDynamicForward, o->num_local_forwards, o->local_forwards);          dump_cfg_forwards(oDynamicForward, o->num_local_forwards, o->local_forwards);
Legend:
Removed from v.1.345  
changed lines
  Added in v.1.346