Get suexec compiling again.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87530 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index fe2160b83daae3fd3d0d98719f46dc5eb99c3763..fe1ef6713e1ba402d3a86bbd341d34581162501b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -172,31 +172,31 @@ AC_ARG_WITH(program-name,
 # SuExec parameters
 AC_ARG_WITH(suexec-caller,
 [  --with-suexec-caller=User allowed to call SuExec],[
-  AC_DEFINE_UNQUOTED(AP_HTTPD_USER, $withval, [User allowed to call SuExec] ) ] )
+  AC_DEFINE_UNQUOTED(AP_HTTPD_USER, "$withval", [User allowed to call SuExec] ) ] )
 
 AC_ARG_WITH(suexec-userdir,
 [  --with-suexec-userdir=User subdirectory],[
-  AC_DEFINE_UNQUOTED(AP_USERDIR_SUFFIX, $withval, [User subdirectory] ) ] )
+  AC_DEFINE_UNQUOTED(AP_USERDIR_SUFFIX, "$withval", [User subdirectory] ) ] )
 
 AC_ARG_WITH(suexec-docroot,
 [  --with-suexec-docroot=SuExec root directory],[
-  AC_DEFINE_UNQUOTED(AP_DOC_ROOT, $withval, [SuExec root directory] ) ] )
+  AC_DEFINE_UNQUOTED(AP_DOC_ROOT, "$withval", [SuExec root directory] ) ] )
 
 AC_ARG_WITH(suexec-uidmin,
 [  --with-suexec-uidmin=Minimal allowed UID],[
-  AC_DEFINE_UNQUOTED(AP_UID_MIN, $withval, [Minimal allowed UID] ) ] )
+  AC_DEFINE_UNQUOTED(AP_UID_MIN, "$withval", [Minimal allowed UID] ) ] )
 
 AC_ARG_WITH(suexec-gidmin,
 [  --with-suexec-gidmin=Minimal allowed GID],[
-  AC_DEFINE_UNQUOTED(AP_GID_MIN, $withval, [Minimal allowed GID] ) ] )
+  AC_DEFINE_UNQUOTED(AP_GID_MIN, "$withval", [Minimal allowed GID] ) ] )
 
 AC_ARG_WITH(suexec-logfile,
 [  --with-suexec-logfile=Set the logfile],[
-  AC_DEFINE_UNQUOTED(AP_LOG_EXEC, $withval, [SuExec log file] ) ] )
+  AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file] ) ] )
 
 AC_ARG_WITH(suexec-safepath,
 [  --with-suexec-safepath=Set the safepath],[
-  AC_DEFINE_UNQUOTED(AP_SAFE_PATH, $withval, [safe shell path for SuExec] ) ] )
+  AC_DEFINE_UNQUOTED(AP_SAFE_PATH, "$withval", [safe shell path for SuExec] ) ] )
 
 dnl ### util_xml is always included, so we always need Expat (for now)
 apache_need_expat=yes

diff --git a/support/suexec.c b/support/suexec.c
index 46aefdee1d8daf034a007452ed72d02e0ca134d5..9c95ffec945337eec2987b871c6c4d98223e5ea9 100644 (file)
--- a/support/suexec.c
+++ b/support/suexec.c
@@ -73,7 +73,10 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <string.h>
+#include <time.h>
 
+#include <stdio.h>
 #include <stdarg.h>
 
 #include "suexec.h"
@@ -369,7 +372,7 @@ int main(int argc, char *argv[])
        {
        case -1:        /* Error */
            log_err("failed to setup bs2000 environment for user %s: %s\n",
-                   target_uname, apr_strerror(errno, buf, sizeof(buf)));
+                   target_uname, strerror(errno));
            exit(150);
        case 0: /* Child */
            break;
@@ -577,6 +580,6 @@ int main(int argc, char *argv[])
      * Oh well, log the failure and error out.
      */
     log_err("(%d)%s: exec failed (%s)\n", errno, 
-            apr_strerror(errno, buf, sizeof(buf)), cmd);
+            strerror(errno), cmd);
     exit(255);
 }