[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.243 and 1.244

version 1.243, 2013/10/24 00:51:48 version 1.244, 2013/10/29 09:48:02
Line 83 
Line 83 
         options->x11_forwarding = -1;          options->x11_forwarding = -1;
         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->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 196 
Line 197 
                 options->x11_use_localhost = 1;                  options->x11_use_localhost = 1;
         if (options->xauth_location == NULL)          if (options->xauth_location == NULL)
                 options->xauth_location = _PATH_XAUTH;                  options->xauth_location = _PATH_XAUTH;
           if (options->permit_tty == -1)
                   options->permit_tty = 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 300 
Line 303 
         sListenAddress, sAddressFamily,          sListenAddress, sAddressFamily,
         sPrintMotd, sPrintLastLog, sIgnoreRhosts,          sPrintMotd, sPrintLastLog, sIgnoreRhosts,
         sX11Forwarding, sX11DisplayOffset, sX11UseLocalhost,          sX11Forwarding, sX11DisplayOffset, sX11UseLocalhost,
         sStrictModes, sEmptyPasswd, sTCPKeepAlive,          sPermitTTY, sStrictModes, sEmptyPasswd, sTCPKeepAlive,
         sPermitUserEnvironment, sUseLogin, sAllowTcpForwarding, sCompression,          sPermitUserEnvironment, sUseLogin, sAllowTcpForwarding, sCompression,
         sRekeyLimit, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,          sRekeyLimit, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
         sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,          sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
Line 421 
Line 424 
         { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},          { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
         { "acceptenv", sAcceptEnv, SSHCFG_ALL },          { "acceptenv", sAcceptEnv, SSHCFG_ALL },
         { "permittunnel", sPermitTunnel, SSHCFG_ALL },          { "permittunnel", sPermitTunnel, SSHCFG_ALL },
           { "permittty", sPermitTTY, 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 1085 
Line 1089 
                 charptr = &options->xauth_location;                  charptr = &options->xauth_location;
                 goto parse_filename;                  goto parse_filename;
   
           case sPermitTTY:
                   intptr = &options->permit_tty;
                   goto parse_flag;
   
         case sStrictModes:          case sStrictModes:
                 intptr = &options->strict_modes;                  intptr = &options->strict_modes;
                 goto parse_flag;                  goto parse_flag;
Line 1736 
Line 1744 
         M_CP_INTOPT(x11_display_offset);          M_CP_INTOPT(x11_display_offset);
         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(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 1961 
Line 1970 
         dump_cfg_fmtint(sPrintLastLog, o->print_lastlog);          dump_cfg_fmtint(sPrintLastLog, o->print_lastlog);
         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(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.243  
changed lines
  Added in v.1.244