Changeset 296 for server/fedora

Timestamp:

Apr 23, 2007, 2:25:01 AM (17 years ago)

Author:

andersk

Message:

Replace ref-prepatch/suexec.c with the actually unpatched version.

File:

• server/fedora/ref-prepatch/suexec.c (modified) (7 diffs)

server/fedora/ref-prepatch/suexec.c

@@ -96 +96 @@
     /* variable name starts with */
     "HTTP_",
-    "HTTPS_",
     "SSL_",
 
@@ -142 +141 @@
     "USER_NAME=",
     "TZ=",
-    "PHPRC=",
     NULL
 };
@@ -516 +514 @@
         }
     }
-    char *expected = malloc(strlen(target_homedir)+strlen(AP_USERDIR_SUFFIX)+1);
-    sprintf(expected, "%s/%s", target_homedir, AP_USERDIR_SUFFIX);
-    if ((strncmp(cwd, expected, strlen(expected))) != 0) {
-        log_err("error: file's directory not a subdirectory of user's home directory (%s, %s)\n", cwd, expected);
-        exit(114);
-    }
 
     if ((strncmp(cwd, dwd, strlen(dwd))) != 0) {
@@ -539 +531 @@
      * Error out if cwd is writable by others.
      */
-#if 0
     if ((dir_info.st_mode & S_IWOTH) || (dir_info.st_mode & S_IWGRP)) {
         log_err("directory is writable by others: (%s)\n", cwd);
         exit(116);
     }
-#endif
 
     /*
      * Error out if we cannot stat the program.
      */
-    if (((lstat(cmd, &prg_info)) != 0) /*|| (S_ISLNK(prg_info.st_mode))*/) {
+    if (((lstat(cmd, &prg_info)) != 0) || (S_ISLNK(prg_info.st_mode))) {
         log_err("cannot stat program: (%s)\n", cmd);
         exit(117);
@@ -557 +547 @@
      * Error out if the program is writable by others.
      */
-#if 0
     if ((prg_info.st_mode & S_IWOTH) || (prg_info.st_mode & S_IWGRP)) {
         log_err("file is writable by others: (%s/%s)\n", cwd, cmd);
         exit(118);
     }
-#endif
 
     /*
@@ -576 +564 @@
      * the name/group of the cwd or the program.
      */
-#if 0
     if ((uid != dir_info.st_uid) ||
         (gid != dir_info.st_gid) ||
@@ -588 +575 @@
         exit(120);
     }
-#endif
     /*
      * Error out if the program is not executable for the user.