Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (13 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
1 deleted
4 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/fc17-dev

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

    r1877 r2195  
    314314         exit(121);
    315315     }
    316 @@ -614,6 +767,23 @@
     316@@ -614,6 +767,30 @@
    317317     /*
    318318      * Execute the command, replacing our image with its own.
    … …  
    331331+        argv[1] = PHP_PATH;
    332332+        argv[2] = "-f";
     333+        /*
     334+         * argv[3] is the command to run. argv[4] is either an argument or
     335+         * already null. We don't want to pass any arguments through from
     336+         * Apache (since they're untrusted), so we chop off the remainder
     337+         * of argv here.
     338+         */
     339+        argv[4] = 0;
    333340+        execv(PHP_PATH, &argv[1]);
    334341+        log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[1]);

  • branches/fc17-dev/server/common/patches/openafs-systemd-crond.patch

    r2066 r2195  
    1414 
    1515 [Install]
    16 -WantedBy=multi-user.target
    17 +WantedBy=multi-user.target crond.service
     16-WantedBy=multi-user.target remote-fs.target
     17+WantedBy=multi-user.target remote-fs.target crond.service

  • branches/fc17-dev/server/common/patches/openafs-systemd.patch

    r2066 r2195  
    3232+
    3333+[Install]
    34 +WantedBy=multi-user.target
     34+WantedBy=multi-user.target remote-fs.target
    3535diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service
    3636new file mode 100644
Note: See TracChangeset for help on using the changeset viewer.