[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.222 and 1.223

version 1.222, 2014/10/24 02:01:20 version 1.223, 2014/12/04 02:24:32
Line 143 
Line 143 
         oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,          oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
         oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,          oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
         oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,          oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
         oStreamLocalBindMask, oStreamLocalBindUnlink,          oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
         oIgnoredUnknownOption, oDeprecated, oUnsupported          oIgnoredUnknownOption, oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 258 
Line 258 
         { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },          { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
         { "streamlocalbindmask", oStreamLocalBindMask },          { "streamlocalbindmask", oStreamLocalBindMask },
         { "streamlocalbindunlink", oStreamLocalBindUnlink },          { "streamlocalbindunlink", oStreamLocalBindUnlink },
           { "revokedhostkeys", oRevokedHostKeys },
         { "ignoreunknown", oIgnoreUnknown },          { "ignoreunknown", oIgnoreUnknown },
   
         { NULL, oBadOption }          { NULL, oBadOption }
Line 1443 
Line 1444 
                 intptr = &options->fwd_opts.streamlocal_bind_unlink;                  intptr = &options->fwd_opts.streamlocal_bind_unlink;
                 goto parse_flag;                  goto parse_flag;
   
           case oRevokedHostKeys:
                   charptr = &options->revoked_host_keys;
                   goto parse_string;
   
         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 1619 
Line 1624 
         options->canonicalize_max_dots = -1;          options->canonicalize_max_dots = -1;
         options->canonicalize_fallback_local = -1;          options->canonicalize_fallback_local = -1;
         options->canonicalize_hostname = -1;          options->canonicalize_hostname = -1;
           options->revoked_host_keys = NULL;
 }  }
   
 /*  /*
Line 1804 
Line 1810 
         CLEAR_ON_NONE(options->local_command);          CLEAR_ON_NONE(options->local_command);
         CLEAR_ON_NONE(options->proxy_command);          CLEAR_ON_NONE(options->proxy_command);
         CLEAR_ON_NONE(options->control_path);          CLEAR_ON_NONE(options->control_path);
           CLEAR_ON_NONE(options->revoked_host_keys);
         /* options->user will be set in the main program if appropriate */          /* options->user will be set in the main program if appropriate */
         /* options->hostname will be set in the main program if appropriate */          /* options->hostname will be set in the main program if appropriate */
         /* options->host_key_alias should not be set by default */          /* options->host_key_alias should not be set by default */
Line 2237 
Line 2244 
         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(oXAuthLocation, o->xauth_location);
           dump_cfg_string(oRevokedHostKeys, o->revoked_host_keys);
   
         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);

Legend:
Removed from v.1.222  
changed lines
  Added in v.1.223