[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.249 and 1.250

version 1.249, 2014/01/29 06:18:35 version 1.250, 2014/07/03 22:40:43
Line 84 
Line 84 
         options->x11_display_offset = -1;          options->x11_display_offset = -1;
         options->x11_use_localhost = -1;          options->x11_use_localhost = -1;
         options->permit_tty = -1;          options->permit_tty = -1;
           options->permit_user_rc = -1;
         options->xauth_location = NULL;          options->xauth_location = NULL;
         options->strict_modes = -1;          options->strict_modes = -1;
         options->tcp_keep_alive = -1;          options->tcp_keep_alive = -1;
Line 200 
Line 201 
                 options->xauth_location = _PATH_XAUTH;                  options->xauth_location = _PATH_XAUTH;
         if (options->permit_tty == -1)          if (options->permit_tty == -1)
                 options->permit_tty = 1;                  options->permit_tty = 1;
           if (options->permit_user_rc == -1)
                   options->permit_user_rc = 1;
         if (options->strict_modes == -1)          if (options->strict_modes == -1)
                 options->strict_modes = 1;                  options->strict_modes = 1;
         if (options->tcp_keep_alive == -1)          if (options->tcp_keep_alive == -1)
Line 318 
Line 321 
         sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,          sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,
         sKexAlgorithms, sIPQoS, sVersionAddendum,          sKexAlgorithms, sIPQoS, sVersionAddendum,
         sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,          sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,
         sAuthenticationMethods, sHostKeyAgent,          sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
         sDeprecated, sUnsupported          sDeprecated, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
   
Line 419 
Line 422 
         { "acceptenv", sAcceptEnv, SSHCFG_ALL },          { "acceptenv", sAcceptEnv, SSHCFG_ALL },
         { "permittunnel", sPermitTunnel, SSHCFG_ALL },          { "permittunnel", sPermitTunnel, SSHCFG_ALL },
         { "permittty", sPermitTTY, SSHCFG_ALL },          { "permittty", sPermitTTY, SSHCFG_ALL },
           { "permituserrc", sPermitUserRC, SSHCFG_ALL },
         { "match", sMatch, SSHCFG_ALL },          { "match", sMatch, SSHCFG_ALL },
         { "permitopen", sPermitOpen, SSHCFG_ALL },          { "permitopen", sPermitOpen, SSHCFG_ALL },
         { "forcecommand", sForceCommand, SSHCFG_ALL },          { "forcecommand", sForceCommand, SSHCFG_ALL },
Line 1083 
Line 1087 
                 intptr = &options->permit_tty;                  intptr = &options->permit_tty;
                 goto parse_flag;                  goto parse_flag;
   
           case sPermitUserRC:
                   intptr = &options->permit_user_rc;
                   goto parse_flag;
   
         case sStrictModes:          case sStrictModes:
                 intptr = &options->strict_modes;                  intptr = &options->strict_modes;
                 goto parse_flag;                  goto parse_flag;
Line 1719 
Line 1727 
         M_CP_INTOPT(x11_forwarding);          M_CP_INTOPT(x11_forwarding);
         M_CP_INTOPT(x11_use_localhost);          M_CP_INTOPT(x11_use_localhost);
         M_CP_INTOPT(permit_tty);          M_CP_INTOPT(permit_tty);
           M_CP_INTOPT(permit_user_rc);
         M_CP_INTOPT(max_sessions);          M_CP_INTOPT(max_sessions);
         M_CP_INTOPT(max_authtries);          M_CP_INTOPT(max_authtries);
         M_CP_INTOPT(ip_qos_interactive);          M_CP_INTOPT(ip_qos_interactive);
Line 1955 
Line 1964 
         dump_cfg_fmtint(sX11Forwarding, o->x11_forwarding);          dump_cfg_fmtint(sX11Forwarding, o->x11_forwarding);
         dump_cfg_fmtint(sX11UseLocalhost, o->x11_use_localhost);          dump_cfg_fmtint(sX11UseLocalhost, o->x11_use_localhost);
         dump_cfg_fmtint(sPermitTTY, o->permit_tty);          dump_cfg_fmtint(sPermitTTY, o->permit_tty);
           dump_cfg_fmtint(sPermitUserRC, o->permit_user_rc);
         dump_cfg_fmtint(sStrictModes, o->strict_modes);          dump_cfg_fmtint(sStrictModes, o->strict_modes);
         dump_cfg_fmtint(sTCPKeepAlive, o->tcp_keep_alive);          dump_cfg_fmtint(sTCPKeepAlive, o->tcp_keep_alive);
         dump_cfg_fmtint(sEmptyPasswd, o->permit_empty_passwd);          dump_cfg_fmtint(sEmptyPasswd, o->permit_empty_passwd);
Legend:
Removed from v.1.249  
changed lines
  Added in v.1.250