httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: httpd-2.0/support suexec.c
Date Wed, 27 Dec 2000 02:01:47 GMT
rbb         00/12/26 18:01:47

  Modified:    .        configure.in
               support  suexec.c
  Log:
  Get suexec compiling again.
  
  Revision  Changes    Path
  1.109     +7 -7      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- configure.in	2000/12/23 03:15:15	1.108
  +++ configure.in	2000/12/27 02:01:46	1.109
  @@ -172,31 +172,31 @@
   # 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
  
  
  
  1.8       +5 -2      httpd-2.0/support/suexec.c
  
  Index: suexec.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/suexec.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- suexec.c	2000/12/23 03:15:16	1.7
  +++ suexec.c	2000/12/27 02:01:47	1.8
  @@ -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 @@
   	{
   	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 @@
        * 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);
   }
  
  
  

Mime
View raw message