Ignore:
Timestamp:
Jun 27, 2012, 10:29:47 PM (10 years ago)
Author:
ezyang
Message:
Reintegrate Fedora 17 development branch into trunk.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r1137 r2246  
    2828void scripts_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
    2929
    30 static function_entry scripts_functions[] = {
     30static zend_function_entry scripts_functions[] = {
    3131    {NULL, NULL, NULL}
    3232};
  • trunk/server/common/oursrc/sql-signup/sql-signup-pam

    r119 r2246  
    11#%PAM-1.0
    2 auth            sufficient      pam_succeed_if.so uid >= 500 quiet
     2auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
    33auth            include         config-util
    44account         include         config-util
  • trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.in

    r2066 r2246  
    33/sbin/sysctl -q afs.GCPAGs=0
    44@fs_path@ setcrypt on
    5 @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'
     5@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'
    66
    77@fs_path@ setcell -nosuid -c athena
Note: See TracChangeset for help on using the changeset viewer.