lars 98/11/08 13:24:05
Modified: . Makefile.tmpl configure README.configure
src/support suexec.h
src CHANGES
Log:
/tmp/suexec.msg
Revision Changes Path
1.49 +4 -2 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile.tmpl 1998/09/19 12:41:48 1.48
+++ Makefile.tmpl 1998/11/08 21:24:00 1.49
@@ -113,6 +113,8 @@
# suexec details (optional)
suexec = @suexec@
suexec_caller = @suexec_caller@
+suexec_docroot = @suexec_docroot@
+suexec_logexec = @suexec_logexec@
suexec_userdir = @suexec_userdir@
suexec_uidmin = @suexec_uidmin@
suexec_gidmin = @suexec_gidmin@
@@ -166,8 +168,8 @@
-DUID_MIN=$(suexec_uidmin) \
-DGID_MIN=$(suexec_gidmin) \
-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
- -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
- -DDOC_ROOT=\"$(datadir)/htdocs\" \
+ -DLOG_EXEC=\"$(suexec_logexec)\" \
+ -DDOC_ROOT=\"$(suexec_docroot)\" \
-DSAFE_PATH=\"$(suexec_safepath)\" \
' \
suexec; \
1.50 +29 -5 apache-1.3/configure
Index: configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- configure 1998/10/27 10:20:12 1.49
+++ configure 1998/11/08 21:24:01 1.50
@@ -192,6 +192,8 @@
# suexec defaults
suexec=0
suexec_ok=0
+suexec_docroot='$datadir/htdocs'
+suexec_logexec='$logfiledir/suexec_log'
suexec_caller=www
suexec_userdir=public_html
suexec_uidmin=100
@@ -426,6 +428,8 @@
echo "suEXEC options:"
echo " --enable-suexec enable the suEXEC feature"
echo " --suexec-caller=NAME set the suEXEC username of the
allowed caller [$suexec_caller]"
+ echo " --suexec-docroot=DIR set the suEXEC root directory
[PREFIX/share/htdocs]"
+ echo " --suexec-logfile=FILE set the suEXEC logfile
[PREFIX/var/log/suexec_log]"
echo " --suexec-userdir=DIR set the suEXEC user subdirectory
[$suexec_userdir]"
echo " --suexec-uidmin=UID set the suEXEC minimal allowed UID
[$suexec_uidmin]"
echo " --suexec-gidmin=GID set the suEXEC minimal allowed GID
[$suexec_gidmin]"
@@ -736,6 +740,14 @@
suexec_caller="$apc_optarg"
suexec_ok=1
;;
+ --suexec-docroot=*)
+ suexec_docroot="$apc_optarg"
+ suexec_ok=1
+ ;;
+ --suexec-logfile=*)
+ suexec_logexec="$apc_optarg"
+ suexec_ok=1
+ ;;
--suexec-userdir=*)
suexec_userdir="$apc_optarg"
suexec_ok=1
@@ -799,10 +811,9 @@
## they do not end with a backslash
##
OIFS="$IFS" IFS="$DIFS"
-for var in prefix exec_prefix bindir sbindir \
- libexecdir mandir sysconfdir datadir \
- includedir localstatedir runtimedir \
- logfiledir proxycachedir; do
+for var in prefix exec_prefix bindir sbindir libexecdir mandir sysconfdir \
+ sysconfdir datadir includedir localstatedir runtimedir \
+ logfiledir proxycachedir suexec_docroot suexec_logexec; do
eval "val=\"\$$var\"";
val=`echo $val | sed -e 's:/*$::'`
eval "$var=\"$val\""
@@ -895,7 +906,6 @@
echo ""
echo "Compilation paths:"
echo " HTTPD_ROOT: $prefix"
- echo " SUEXEC_BIN: $sbindir/suexec"
echo " SHARED_CORE_DIR: $libexecdir"
echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
@@ -907,6 +917,18 @@
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
echo " RESOURCE_CONFIG_FILE: ${sysconfdir_relative}srm.conf"
echo ""
+ if [ ".$suexec" = .1 ]; then
+ echo "suEXEC setup:"
+ echo " suexec binary: $sbindir/suexec"
+ echo " document root: $suexec_docroot"
+ echo " userdir suffix: $suexec_userdir"
+ echo " logfile: $suexec_logexec"
+ echo " safe path: $suexec_safepath"
+ echo " caller ID: $suexec_caller"
+ echo " minimum user ID: $suexec_uidmin"
+ echo " minimum group ID: $suexec_gidmin"
+ echo ""
+ fi
exit 0
fi
@@ -938,6 +960,8 @@
-e "[EMAIL PROTECTED]@%$proxycachedir%g" \
-e "[EMAIL PROTECTED]@%$suexec%g" \
-e "[EMAIL PROTECTED]@%$suexec_caller%g" \
+-e "[EMAIL PROTECTED]@%$suexec_docroot%g" \
+-e "[EMAIL PROTECTED]@%$suexec_logexec%g" \
-e "[EMAIL PROTECTED]@%$suexec_userdir%g" \
-e "[EMAIL PROTECTED]@%$suexec_uidmin%g" \
-e "[EMAIL PROTECTED]@%$suexec_gidmin%g" \
1.15 +9 -4 apache-1.3/README.configure
Index: README.configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/README.configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- README.configure 1998/09/28 15:46:39 1.14
+++ README.configure 1998/11/08 21:24:01 1.15
@@ -98,7 +98,9 @@
$ ./configure --prefix=/path/to/apache \
--enable-suexec \
--suexec-caller=www \
- --suexec-userdir=.www
+ --suexec-userdir=.www \
+ --suexec-docroot=/path/to/root/dir \
+ --suexec-logfile=/path/to/logdir/suexec_log \
--suexec-uidmin=1000 \
--suexec-gidmin=1000 \
--suexec-safepath="/bin:/usr/bin"
@@ -106,9 +108,12 @@
$ make install
This automatically builds and installs Apache 1.3 with suEXEC support for
- the caller uid "www" and the user's homedir subdirs ".www". The access
- paths for the suexec program are automatically adjusted and the suexec
- program is installed, so Apache can find it on startup.
+ the caller uid "www" and the user's homedir subdirs ".www". The default
+ paths for --suexec-docroot is the value from the --datadir option with
+ the suffix "/htdocs" and the --logfiledir value with the suffix
+ "/suexec_log" for the --suexec-logfile option. The access paths for the
+ suexec program are automatically adjusted and the suexec program is
+ installed, so Apache can find it on startup.
Building multiple platforms in parallel
---------------------------------------
1.15 +1 -0 apache-1.3/src/support/suexec.h
Index: suexec.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/suexec.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- suexec.h 1998/03/31 12:54:09 1.14
+++ suexec.h 1998/11/08 21:24:02 1.15
@@ -57,6 +57,7 @@
/*
* suexec.h -- user-definable variables for the suexec wrapper code.
+ * (See README.configure on how to customize these variables.)
*/
1.1141 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1140
retrieving revision 1.1141
diff -u -r1.1140 -r1.1141
--- CHANGES 1998/11/08 09:51:07 1.1140
+++ CHANGES 1998/11/08 21:24:03 1.1141
@@ -1,5 +1,11 @@
Changes with Apache 1.3.4
+ *) Add APACI --suexec-docroot and --suexec-logfile options which can be
+ used to set the document root directory (DOC_ROOT) and the suexec
+ logfile (LOG_EXEC), respectively. Additionally the --layout option
+ was changed to show more information about the suEXEC setup.
+ [Lars Eilebrecht] PR#3316, 3357, 3361
+
*) Enabled all of the WebDAV method names for use by third-party
modules, Limit, and Script directives. That includes PATCH,
PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, and UNLOCK.
