Changeset 1878 for branches/fc15-dev/server/common/patches

Timestamp:

Jun 7, 2011, 12:58:14 PM (13 years ago)

Author:

achernya

Message:

Merge r1803-1877 from trunk to branches/fc15-dev

Location:

branches/fc15-dev

Files:

• . (modified) (1 prop)
• server/common/patches/httpd-suexec-scripts.patch (modified) (14 diffs)

branches/fc15-dev/server/common/patches/httpd-suexec-scripts.patch

@@ -73 +73 @@
  
      /* variable name is */
-@@ -245,9 +250,71 @@
+@@ -245,9 +250,108 @@
      environ = cleanenv;
  }
@@ -100 +100 @@
 +    "xls",
 +    "ppt",
++    "dot",
++    "docx",
++    "dotx",
++    "docm",
++    "dotm",
++    "xlt",
++    "xla",
++    "xlsx",
++    "xltx",
++    "xlsm",
++    "xltm",
++    "xlam",
++    "xlsb",
++    "pot",
++    "pps",
++    "ppa",
++    "pptx",
++    "potx",
++    "ppsx",
++    "ppam",
++    "pptm",
++    "potm",
++    "ppsm",
 +    "swf",
 +    "mp3",
@@ -117 +140 @@
 +    "ttf",
 +    "otf",
++    "odc",
++    "odb",
++    "odf",
++    "odg",
++    "otg",
++    "odi",
++    "odp",
++    "otp",
++    "ods",
++    "ots",
++    "odt",
++    "odm",
++    "ott",
++    "oth",
 +    NULL
 +};
@@ -145 +182 @@
      gid_t gid;              /* target group placeholder  */
      char *target_uname;     /* target user name          */
-@@ -268,6 +331,7 @@
+@@ -268,6 +368,7 @@
       * Start with a "clean" environment
       */
@@ -153 +190 @@
      prog = argv[0];
      /*
-@@ -350,6 +414,20 @@
+@@ -350,6 +451,20 @@
  #endif /*_OSD_POSIX*/
  
@@ -174 +211 @@
       * or attempts to back up out of the current directory,
       * to protect against attacks.  If any are
-@@ -371,6 +449,7 @@
+@@ -371,6 +486,7 @@
          userdir = 1;
      }
@@ -182 +219 @@
       * Error out if the target username is invalid.
       */
-@@ -452,7 +531,7 @@
+@@ -452,7 +568,7 @@
       * Error out if attempt is made to execute as root or as
       * a UID less than AP_UID_MIN.  Tsk tsk.
@@ -191 +228 @@
          exit(107);
      }
-@@ -484,6 +563,7 @@
+@@ -484,6 +599,7 @@
          log_err("failed to setuid (%ld: %s)\n", uid, cmd);
          exit(110);
@@ -199 +236 @@
      /*
       * Get the current working directory, as well as the proper
-@@ -506,6 +600,21 @@
+@@ -506,6 +637,21 @@
              log_err("cannot get docroot information (%s)\n", target_homedir);
              exit(112);
@@ -221 +258 @@
      else {
          if (((chdir(AP_DOC_ROOT)) != 0) ||
-@@ -532,15 +641,17 @@
+@@ -532,15 +678,17 @@
      /*
       * Error out if cwd is writable by others.
@@ -240 +277 @@
          exit(117);
      }
-@@ -548,10 +659,12 @@
+@@ -548,10 +696,12 @@
      /*
       * Error out if the program is writable by others.
@@ -253 +290 @@
      /*
       * Error out if the file is setuid or setgid.
-@@ -565,6 +678,7 @@
+@@ -565,6 +715,7 @@
       * Error out if the target name/group is different from
       * the name/group of the cwd or the program.
@@ -261 +298 @@
          (gid != dir_info.st_gid) ||
          (uid != prg_info.st_uid) ||
-@@ -576,12 +690,14 @@
+@@ -576,12 +727,14 @@
                  prg_info.st_uid, prg_info.st_gid);
          exit(120);
@@ -277 +314 @@
          exit(121);
      }
-@@ -614,6 +730,23 @@
+@@ -614,6 +767,23 @@
      /*
       * Execute the command, replacing our image with its own.