Changeset 2246 for trunk/server/common

Timestamp:

Jun 27, 2012, 10:29:47 PM (13 years ago)

Author:

ezyang

Message:

Reintegrate Fedora 17 development branch into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• server/common/oursrc/php_scripts/php_scripts.h (modified) (1 diff)
• server/common/oursrc/sql-signup/sql-signup-pam (modified) (1 diff)
• server/common/oursrc/tokensys/scripts-afsagent-startup.in (modified) (1 diff)
• server/common/patches/httpd-sysv-deps.patch (deleted)

trunk/server/common/oursrc/php_scripts/php_scripts.h

@@ -28 +28 @@
 void scripts_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
 
-static function_entry scripts_functions[] = {
+static zend_function_entry scripts_functions[] = {
     {NULL, NULL, NULL}
 };

trunk/server/common/oursrc/sql-signup/sql-signup-pam

@@ -1 +1 @@
 #%PAM-1.0
-auth            sufficient      pam_succeed_if.so uid >= 500 quiet
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
 auth            include         config-util
 account         include         config-util

trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.in

@@ -3 +3 @@
 /sbin/sysctl -q afs.GCPAGs=0
 @fs_path@ setcrypt on
-@fs_path@ sysname 'amd64_fedora15_scripts' 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora15' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb60' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2'
+@fs_path@ sysname 'amd64_fedora17_scripts' 'amd64_fedora15_scripts' 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora17' 'amd64_fedora15' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb60' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2'
 
 @fs_path@ setcell -nosuid -c athena