svn commit: r903452 - /commons/sandbox/runtime/trunk/src/main/native/configure

[mt...@apache.org]

Author: mturk
Date: Tue Jan 26 22:12:50 2010
New Revision: 903452

URL: http://svn.apache.org/viewvc?rev=903452&view=rev
Log:
Add suexec config options

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=903452&r1=903451&r2=903452&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Tue Jan 26 22:12:50 2010
@@ -120,6 +120,13 @@
 mach=unknown
 has_legacy_code=no
 
+with_suexec_root=/var/www
+with_suexec_log=/var/log/apachecommons/suexec.log
+with_suexec_user=www
+with_suexec_uid_min=100
+with_suexec_gid_min=100
+with_suexec_user_dir=public_html
+
 for o
 do
     case "$o" in
@@ -236,8 +243,8 @@
                 exit 1
                 ;;
             esac
-            eval with_suexec_$a=$v
-            eval with_suexec_$a_set=yes        
+            eval "with_suexec_$a=\"$v\""
+            eval have_suexec_$a=yes
         ;;
         CC=*)       cc="$a" ;       shift ;;
         CXX=*)      cxx="$a" ;      shift ;;
@@ -1020,12 +1027,14 @@
 test ".$sizeof_long_double" = .0 && have_long_double=0
 
 if [ ".$host" = .windows ]; then
+    PS=\\\\
     have_ktmw32=`have_include w ktmw32`
     have_aio=0
     have_windows=1
     have_uuid_uuid=0
     have_off64t=0
 else
+    PS=/
     have_ktmw32=0
     have_off64t=1
     sizeof_off64_t=`check_sizeof off64_t 0`
@@ -1139,6 +1148,9 @@
 
 if [ ".$has_suexec" = .yes ]; then
     varadds modules '??(SUEXECBIN)'
+    have_suexec=1
+else
+    have_suexec=0
 fi
 
 if [ ".$cc" = .gcc ]; then
@@ -1187,6 +1199,7 @@
 #define HAVE_SELINUX_H        $have_selinux
 #define HAVE_PORT_H           $have_port
 #define HAVE_SQLITE3          $have_sqlite3
+#define HAVE_SUEXEC           $have_suexec
 
 #define HAVE_UNISTD_H         `have_include x unistd`
 #define HAVE_STRING_H         `have_include w string`
@@ -1259,6 +1272,26 @@
 #define HAVE_UINT64_T         `have_typedef uint64_t`
 #define HAVE_INTPTR_T         `have_typedef intptr_t`
 #define HAVE_UINTPTR_T        `have_typedef uintptr_t`
+EOF
+
+if [ ".$has_suexec" = .yes ]; then
+cat >> $topdir/include/acr_cc$bits.h << EOF
+
+#define AC_SUEXEC_ROOT        "$with_suexec_root"
+#define AC_SUEXEC_USER        "$with_suexec_user"
+#define AC_SUEXEC_USERDIR     "$with_suexec_user_dir"
+#define AC_SUEXEC_LOG_EXEC    "$with_suexec_log"
+#define AC_SUEXEC_UID_MIN     $with_suexec_uid_min
+#define AC_SUEXEC_GID_MIN     $with_suexec_gid_min
+EOF
+    if [ ".$have_suexec_safe_path" = .yes ]; then
+cat >> $topdir/include/acr_cc$bits.h << EOF
+#define AC_SUEXEC_SAFE_PATH   "$with_suexec_safe_path"
+EOF
+    fi
+fi
+
+cat >> $topdir/include/acr_cc$bits.h << EOF
 
 #define CC_SIZEOF_INT         $sizeof_int
 #define CC_SIZEOF_WCHAR_T     $sizeof_wchar