change default values in here to sane ones for OpenBSD. suexec.h stuff

gets set in config, but DEFAULT_PATH in httpd.h was an interesting polyglot
of hoary old stuff from the RiscOS days...

3 files changed, 12 insertions, 7 deletions

diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index ecee7b0ba47..732f524a13d 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Apache 
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 1999/10/01 05:30:27 beck Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 1999/10/01 21:54:19 beck Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -520,6 +520,11 @@ lint:
 tags:
 	# Nothing here so far...
 
+.ifdef NOMAN
+maninstall:
+	@echo NOMAN is set
+.endif
+
 distribution:
 	@-for i in ${CONFFILES}; do \
 		j=`dirname $$i`; \
diff --git a/usr.sbin/httpd/src/include/httpd.h b/usr.sbin/httpd/src/include/httpd.h
index fdf93d3c8a2..0b9e0f86e1d 100644
--- a/usr.sbin/httpd/src/include/httpd.h
+++ b/usr.sbin/httpd/src/include/httpd.h
@@ -252,7 +252,7 @@ extern "C" {
 
 /* The default path for CGI scripts if none is currently set */
 #ifndef DEFAULT_PATH
-#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin"
+#define DEFAULT_PATH "/bin:/usr/bin:local/bin"
 #endif
 
 /* The path to the shell interpreter, for parsed docs */
diff --git a/usr.sbin/httpd/src/support/suexec.h b/usr.sbin/httpd/src/support/suexec.h
index 892badd1e0b..5a5f4832da7 100644
--- a/usr.sbin/httpd/src/support/suexec.h
+++ b/usr.sbin/httpd/src/support/suexec.h
@@ -78,7 +78,7 @@
  *            for suEXEC.  For most systems, 500 or 100 is common.
  */
 #ifndef UID_MIN
-#define UID_MIN 100
+#define UID_MIN 1000
 #endif
 
 /*
@@ -86,7 +86,7 @@
  *            for suEXEC.  For most systems, 100 is common.
  */
 #ifndef GID_MIN
-#define GID_MIN 100
+#define GID_MIN 1000
 #endif
 
 /*
@@ -120,7 +120,7 @@
  *             debugging purposes.
  */
 #ifndef LOG_EXEC
-#define LOG_EXEC "/usr/local/apache/logs/cgi.log"	/* Need me? */
+#define LOG_EXEC "/var/log/suexec_log"	/* Need me? */
 #endif
 
 /*
@@ -129,7 +129,7 @@
  *             that can be used for suEXEC behavior.
  */
 #ifndef DOC_ROOT
-#define DOC_ROOT "/usr/local/apache/htdocs"
+#define DOC_ROOT "/var/www/htdocs"
 #endif
 
 /*
@@ -137,7 +137,7 @@
  *
  */
 #ifndef SAFE_PATH
-#define SAFE_PATH "/usr/local/bin:/usr/bin:/bin"
+#define SAFE_PATH "/usr/bin:/bin:/usr/local/bin"
 #endif
 
 #endif /* _SUEXEC_H */