[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.358 and 1.359

version 1.358, 2021/07/02 05:11:21 version 1.359, 2021/07/13 23:48:36
Line 153 
Line 153 
         oTunnel, oTunnelDevice,          oTunnel, oTunnelDevice,
         oLocalCommand, oPermitLocalCommand, oRemoteCommand,          oLocalCommand, oPermitLocalCommand, oRemoteCommand,
         oVisualHostKey,          oVisualHostKey,
         oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,          oKexAlgorithms, oIPQoS, oRequestTTY, oSessionType,
           oIgnoreUnknown, oProxyUseFdpass,
         oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,          oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
         oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,          oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
         oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,          oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
Line 283 
Line 284 
         { "kexalgorithms", oKexAlgorithms },          { "kexalgorithms", oKexAlgorithms },
         { "ipqos", oIPQoS },          { "ipqos", oIPQoS },
         { "requesttty", oRequestTTY },          { "requesttty", oRequestTTY },
           { "sessiontype", oSessionType },
         { "proxyusefdpass", oProxyUseFdpass },          { "proxyusefdpass", oProxyUseFdpass },
         { "canonicaldomains", oCanonicalDomains },          { "canonicaldomains", oCanonicalDomains },
         { "canonicalizefallbacklocal", oCanonicalizeFallbackLocal },          { "canonicalizefallbacklocal", oCanonicalizeFallbackLocal },
Line 858 
Line 860 
         { "auto",                       REQUEST_TTY_AUTO },          { "auto",                       REQUEST_TTY_AUTO },
         { NULL, -1 }          { NULL, -1 }
 };  };
   static const struct multistate multistate_sessiontype[] = {
           { "none",                       SESSION_TYPE_NONE },
           { "subsystem",                  SESSION_TYPE_SUBSYSTEM },
           { "default",                    SESSION_TYPE_DEFAULT },
           { NULL, -1 }
   };
 static const struct multistate multistate_canonicalizehostname[] = {  static const struct multistate multistate_canonicalizehostname[] = {
         { "true",                       SSH_CANONICALISE_YES },          { "true",                       SSH_CANONICALISE_YES },
         { "false",                      SSH_CANONICALISE_NO },          { "false",                      SSH_CANONICALISE_NO },
Line 1927 
Line 1935 
                 multistate_ptr = multistate_requesttty;                  multistate_ptr = multistate_requesttty;
                 goto parse_multistate;                  goto parse_multistate;
   
           case oSessionType:
                   intptr = &options->session_type;
                   multistate_ptr = multistate_sessiontype;
                   goto parse_multistate;
   
         case oIgnoreUnknown:          case oIgnoreUnknown:
                 charptr = &options->ignored_unknown;                  charptr = &options->ignored_unknown;
                 goto parse_string;                  goto parse_string;
Line 2349 
Line 2362 
         options->ip_qos_interactive = -1;          options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;          options->ip_qos_bulk = -1;
         options->request_tty = -1;          options->request_tty = -1;
           options->session_type = -1;
         options->proxy_use_fdpass = -1;          options->proxy_use_fdpass = -1;
         options->ignored_unknown = NULL;          options->ignored_unknown = NULL;
         options->num_canonical_domains = 0;          options->num_canonical_domains = 0;
Line 2533 
Line 2547 
                 options->ip_qos_bulk = IPTOS_DSCP_CS1;                  options->ip_qos_bulk = IPTOS_DSCP_CS1;
         if (options->request_tty == -1)          if (options->request_tty == -1)
                 options->request_tty = REQUEST_TTY_AUTO;                  options->request_tty = REQUEST_TTY_AUTO;
           if (options->session_type == -1)
                   options->session_type = SESSION_TYPE_DEFAULT;
         if (options->proxy_use_fdpass == -1)          if (options->proxy_use_fdpass == -1)
                 options->proxy_use_fdpass = 0;                  options->proxy_use_fdpass = 0;
         if (options->canonicalize_max_dots == -1)          if (options->canonicalize_max_dots == -1)
Line 3042 
Line 3058 
                 return fmt_multistate_int(val, multistate_tunnel);                  return fmt_multistate_int(val, multistate_tunnel);
         case oRequestTTY:          case oRequestTTY:
                 return fmt_multistate_int(val, multistate_requesttty);                  return fmt_multistate_int(val, multistate_requesttty);
           case oSessionType:
                   return fmt_multistate_int(val, multistate_sessiontype);
         case oCanonicalizeHostname:          case oCanonicalizeHostname:
                 return fmt_multistate_int(val, multistate_canonicalizehostname);                  return fmt_multistate_int(val, multistate_canonicalizehostname);
         case oAddKeysToAgent:          case oAddKeysToAgent:
Line 3203 
Line 3221 
         dump_cfg_fmtint(oProxyUseFdpass, o->proxy_use_fdpass);          dump_cfg_fmtint(oProxyUseFdpass, o->proxy_use_fdpass);
         dump_cfg_fmtint(oPubkeyAuthentication, o->pubkey_authentication);          dump_cfg_fmtint(oPubkeyAuthentication, o->pubkey_authentication);
         dump_cfg_fmtint(oRequestTTY, o->request_tty);          dump_cfg_fmtint(oRequestTTY, o->request_tty);
           dump_cfg_fmtint(oSessionType, o->session_type);
         dump_cfg_fmtint(oStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);          dump_cfg_fmtint(oStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);
         dump_cfg_fmtint(oStrictHostKeyChecking, o->strict_host_key_checking);          dump_cfg_fmtint(oStrictHostKeyChecking, o->strict_host_key_checking);
         dump_cfg_fmtint(oTCPKeepAlive, o->tcp_keep_alive);          dump_cfg_fmtint(oTCPKeepAlive, o->tcp_keep_alive);
Legend:
Removed from v.1.358  
changed lines
  Added in v.1.359