[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.305 and 1.306

version 1.305, 2017/03/10 04:11:00 version 1.306, 2017/03/14 07:19:07
Line 489 
Line 489 
         { "clientalivecountmax", sClientAliveCountMax, SSHCFG_ALL },          { "clientalivecountmax", sClientAliveCountMax, SSHCFG_ALL },
         { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },          { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
         { "authorizedkeysfile2", sDeprecated, SSHCFG_ALL },          { "authorizedkeysfile2", sDeprecated, SSHCFG_ALL },
         { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},          { "useprivilegeseparation", sDeprecated, SSHCFG_GLOBAL},
         { "acceptenv", sAcceptEnv, SSHCFG_ALL },          { "acceptenv", sAcceptEnv, SSHCFG_ALL },
         { "permittunnel", sPermitTunnel, SSHCFG_ALL },          { "permittunnel", sPermitTunnel, SSHCFG_ALL },
         { "permittty", sPermitTTY, SSHCFG_ALL },          { "permittty", sPermitTTY, SSHCFG_ALL },
Line 1322 
Line 1322 
                 intptr = &options->disable_forwarding;                  intptr = &options->disable_forwarding;
                 goto parse_flag;                  goto parse_flag;
   
         case sUsePrivilegeSeparation:  
                 intptr = &use_privsep;  
                 multistate_ptr = multistate_privsep;  
                 goto parse_multistate;  
   
         case sAllowUsers:          case sAllowUsers:
                 while ((arg = strdelim(&cp)) && *arg != '\0') {                  while ((arg = strdelim(&cp)) && *arg != '\0') {
                         if (options->num_allow_users >= MAX_ALLOW_USERS)                          if (options->num_allow_users >= MAX_ALLOW_USERS)
Line 2055 
Line 2050 
                 return fmt_multistate_int(val, multistate_gatewayports);                  return fmt_multistate_int(val, multistate_gatewayports);
         case sCompression:          case sCompression:
                 return fmt_multistate_int(val, multistate_compression);                  return fmt_multistate_int(val, multistate_compression);
         case sUsePrivilegeSeparation:  
                 return fmt_multistate_int(val, multistate_privsep);  
         case sAllowTcpForwarding:          case sAllowTcpForwarding:
                 return fmt_multistate_int(val, multistate_tcpfwd);                  return fmt_multistate_int(val, multistate_tcpfwd);
         case sAllowStreamLocalForwarding:          case sAllowStreamLocalForwarding:
Line 2225 
Line 2218 
         dump_cfg_fmtint(sDisableForwarding, o->disable_forwarding);          dump_cfg_fmtint(sDisableForwarding, o->disable_forwarding);
         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(sUsePrivilegeSeparation, use_privsep);  
         dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash);          dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash);
   
         /* string arguments */          /* string arguments */
Legend:
Removed from v.1.305  
changed lines
  Added in v.1.306