Ignore:
Timestamp:
Jun 8, 2009, 1:07:47 PM (13 years ago)
Author:
mitchb
Message:
Merge r1121:1178 from trunk to branches/fc11-dev
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev/server/common/patches/httpd-suexec-scripts.patch

    r1146 r1179  
    4646   AC_DEFINE_UNQUOTED(AP_DOC_ROOT, "$withval", [SuExec root directory] ) ] )
    4747--- httpd-2.2.11/support/suexec.c.old   2008-11-30 10:47:31.000000000 -0500
    48 +++ httpd-2.2.11/support/suexec.c       2009-06-03 05:16:45.000000000 -0400
     48+++ httpd-2.2.11/support/suexec.c       2009-06-08 09:02:17.000000000 -0400
    4949@@ -30,6 +30,9 @@
    5050  *
     
    141141     gid_t gid;              /* target group placeholder  */
    142142     char *target_uname;     /* target user name          */
    143 @@ -350,6 +413,20 @@
     143@@ -268,6 +331,7 @@
     144      * Start with a "clean" environment
     145      */
     146     clean_env();
     147+    setenv("JAVA_TOOL_OPTIONS", "-Xmx128M", 1); /* scripts.mit.edu local hack */
     148 
     149     prog = argv[0];
     150     /*
     151@@ -350,6 +414,20 @@
    144152 #endif /*_OSD_POSIX*/
    145153 
     
    162170      * or attempts to back up out of the current directory,
    163171      * to protect against attacks.  If any are
    164 @@ -371,6 +448,7 @@
     172@@ -371,6 +449,7 @@
    165173         userdir = 1;
    166174     }
     
    170178      * Error out if the target username is invalid.
    171179      */
    172 @@ -452,7 +530,7 @@
     180@@ -452,7 +531,7 @@
    173181      * Error out if attempt is made to execute as root or as
    174182      * a UID less than AP_UID_MIN.  Tsk tsk.
     
    179187         exit(107);
    180188     }
    181 @@ -484,6 +562,21 @@
     189@@ -484,6 +563,21 @@
    182190         log_err("failed to setuid (%ld: %s)\n", uid, cmd);
    183191         exit(110);
     
    201209     /*
    202210      * Get the current working directory, as well as the proper
    203 @@ -506,6 +599,21 @@
     211@@ -506,6 +600,21 @@
    204212             log_err("cannot get docroot information (%s)\n", target_homedir);
    205213             exit(112);
     
    223231     else {
    224232         if (((chdir(AP_DOC_ROOT)) != 0) ||
    225 @@ -532,15 +640,17 @@
     233@@ -532,15 +641,17 @@
    226234     /*
    227235      * Error out if cwd is writable by others.
     
    242250         exit(117);
    243251     }
    244 @@ -548,10 +658,12 @@
     252@@ -548,10 +659,12 @@
    245253     /*
    246254      * Error out if the program is writable by others.
     
    255263     /*
    256264      * Error out if the file is setuid or setgid.
    257 @@ -565,6 +677,7 @@
     265@@ -565,6 +678,7 @@
    258266      * Error out if the target name/group is different from
    259267      * the name/group of the cwd or the program.
     
    263271         (gid != dir_info.st_gid) ||
    264272         (uid != prg_info.st_uid) ||
    265 @@ -576,16 +689,33 @@
     273@@ -576,16 +690,33 @@
    266274                 prg_info.st_uid, prg_info.st_gid);
    267275         exit(120);
Note: See TracChangeset for help on using the changeset viewer.