[BACK]Return to servconf.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/servconf.c between version 1.308 and 1.309

version 1.308, 2017/05/17 01:24:17 version 1.309, 2017/06/24 06:34:38
Line 154 
Line 154 
         options->version_addendum = NULL;          options->version_addendum = NULL;
         options->fingerprint_hash = -1;          options->fingerprint_hash = -1;
         options->disable_forwarding = -1;          options->disable_forwarding = -1;
           options->expose_userauth_info = -1;
 }  }
   
 /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */  /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
Line 316 
Line 317 
                 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;                  options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
         if (options->disable_forwarding == -1)          if (options->disable_forwarding == -1)
                 options->disable_forwarding = 0;                  options->disable_forwarding = 0;
           if (options->expose_userauth_info == -1)
                   options->expose_userauth_info = 0;
   
         assemble_algorithms(options);          assemble_algorithms(options);
   
Line 388 
Line 391 
         sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,          sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
         sStreamLocalBindMask, sStreamLocalBindUnlink,          sStreamLocalBindMask, sStreamLocalBindUnlink,
         sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,          sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
           sExposeAuthInfo,
         sDeprecated, sIgnore, sUnsupported          sDeprecated, sIgnore, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
   
Line 515 
Line 519 
         { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },          { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
         { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },          { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
         { "disableforwarding", sDisableForwarding, SSHCFG_ALL },          { "disableforwarding", sDisableForwarding, SSHCFG_ALL },
           { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
         { NULL, sBadOption, 0 }          { NULL, sBadOption, 0 }
 };  };
   
Line 1783 
Line 1788 
                         options->fingerprint_hash = value;                          options->fingerprint_hash = value;
                 break;                  break;
   
           case sExposeAuthInfo:
                   intptr = &options->expose_userauth_info;
                   goto parse_flag;
   
         case sDeprecated:          case sDeprecated:
         case sIgnore:          case sIgnore:
         case sUnsupported:          case sUnsupported:
Line 1921 
Line 1930 
         M_CP_INTOPT(allow_streamlocal_forwarding);          M_CP_INTOPT(allow_streamlocal_forwarding);
         M_CP_INTOPT(allow_agent_forwarding);          M_CP_INTOPT(allow_agent_forwarding);
         M_CP_INTOPT(disable_forwarding);          M_CP_INTOPT(disable_forwarding);
           M_CP_INTOPT(expose_userauth_info);
         M_CP_INTOPT(permit_tun);          M_CP_INTOPT(permit_tun);
         M_CP_INTOPT(fwd_opts.gateway_ports);          M_CP_INTOPT(fwd_opts.gateway_ports);
         M_CP_INTOPT(fwd_opts.streamlocal_bind_unlink);          M_CP_INTOPT(fwd_opts.streamlocal_bind_unlink);
Line 2213 
Line 2223 
         dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);          dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);
         dump_cfg_fmtint(sStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);          dump_cfg_fmtint(sStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);
         dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash);          dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash);
           dump_cfg_fmtint(sExposeAuthInfo, o->expose_userauth_info);
   
         /* string arguments */          /* string arguments */
         dump_cfg_string(sPidFile, o->pid_file);          dump_cfg_string(sPidFile, o->pid_file);
Legend:
Removed from v.1.308  
changed lines
  Added in v.1.309