[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.378 and 1.379

version 1.378, 2023/07/17 04:04:36 version 1.379, 2023/07/17 04:08:31
Line 128 
Line 128 
   
 typedef enum {  typedef enum {
         oBadOption,          oBadOption,
         oHost, oMatch, oInclude,          oHost, oMatch, oInclude, oTag,
         oForwardAgent, oForwardX11, oForwardX11Trusted, oForwardX11Timeout,          oForwardAgent, oForwardX11, oForwardX11Trusted, oForwardX11Timeout,
         oGatewayPorts, oExitOnForwardFailure,          oGatewayPorts, oExitOnForwardFailure,
         oPasswordAuthentication,          oPasswordAuthentication,
Line 241 
Line 241 
         { "user", oUser },          { "user", oUser },
         { "host", oHost },          { "host", oHost },
         { "match", oMatch },          { "match", oMatch },
           { "tag", oTag },
         { "escapechar", oEscapeChar },          { "escapechar", oEscapeChar },
         { "globalknownhostsfile", oGlobalKnownHostsFile },          { "globalknownhostsfile", oGlobalKnownHostsFile },
         { "userknownhostsfile", oUserKnownHostsFile },          { "userknownhostsfile", oUserKnownHostsFile },
Line 729 
Line 730 
                                 goto out;                                  goto out;
                         }                          }
                         r = check_match_ifaddrs(arg) == 1;                          r = check_match_ifaddrs(arg) == 1;
                   } else if (strcasecmp(attrib, "tagged") == 0) {
                           criteria = xstrdup(options->tag == NULL ? "" :
                               options->tag);
                           r = match_pattern_list(criteria, arg, 0) == 1;
                         if (r == (negate ? 1 : 0))                          if (r == (negate ? 1 : 0))
                                 this_result = result = 0;                                  this_result = result = 0;
                 } else if (strcasecmp(attrib, "exec") == 0) {                  } else if (strcasecmp(attrib, "exec") == 0) {
Line 1349 
Line 1354 
                 charptr = &options->hostname;                  charptr = &options->hostname;
                 goto parse_string;                  goto parse_string;
   
           case oTag:
                   charptr = &options->tag;
                   goto parse_string;
   
         case oHostKeyAlias:          case oHostKeyAlias:
                 charptr = &options->host_key_alias;                  charptr = &options->host_key_alias;
                 goto parse_string;                  goto parse_string;
Line 2496 
Line 2505 
         options->known_hosts_command = NULL;          options->known_hosts_command = NULL;
         options->required_rsa_size = -1;          options->required_rsa_size = -1;
         options->enable_escape_commandline = -1;          options->enable_escape_commandline = -1;
           options->tag = NULL;
 }  }
   
 /*  /*
Line 3408 
Line 3418 
         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);          dump_cfg_string(oKnownHostsCommand, o->known_hosts_command);
           dump_cfg_string(oTag, o->tag);
   
         /* 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.378  
changed lines
  Added in v.1.379