Date: 7 Jul 1998 23:19:24 -0000
Message-ID: <19980707231924.11264.qmail@hyperreal.org>
From: coar@hyperreal.org
To: apache-1.3-cvs@hyperreal.org
Subject: cvs commit: apache-1.3/src/support suexec.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

coar        98/07/07 16:19:24

  Modified:    src      CHANGES
               src/support suexec.c
  Log:
  	Put back the bits that aren't controversial. :-)
  
  Revision  Changes    Path
  1.950     +2 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.949
  retrieving revision 1.950
  diff -u -r1.949 -r1.950
  --- CHANGES	1998/07/07 17:23:19	1.949
  +++ CHANGES	1998/07/07 23:19:22	1.950
  @@ -1,5 +1,7 @@
   Changes with Apache 1.3.1
   
  +  *) suexec's error messages have been clarified a little bit.  [Ken Coar]
  +
     *) PORT: Apache is not 8-bit clean in many settings, a problem we're
        aware of and intend to fix properly.  But a temporary workaround
        which should work for many folks is to tell the C compiler to use
  
  
  
  1.43      +4 -4      apache-1.3/src/support/suexec.c
  
  Index: suexec.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/support/suexec.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- suexec.c	1998/07/07 17:04:19	1.42
  +++ suexec.c	1998/07/07 23:19:24	1.43
  @@ -205,7 +205,7 @@
   
   
       if ((cleanenv = (char **) calloc(AP_ENVBUF, sizeof(char *))) == NULL) {
  -	log_err("failed to malloc env mem\n");
  +        log_err("failed to malloc memory for environment\n");
   	exit(120);
       }
   
  @@ -283,12 +283,12 @@
   #ifdef _OSD_POSIX
       /* User name comparisons are case insensitive on BS2000/OSD */
       if (strcasecmp(HTTPD_USER, pw->pw_name)) {
  -	log_err("user mismatch (%s)\n", pw->pw_name);
  +        log_err("user mismatch (%s instead of %s)\n", pw->pw_name, HTTPD_USER);
   	exit(103);
       }
   #else  /*_OSD_POSIX*/
       if (strcmp(HTTPD_USER, pw->pw_name)) {
  -	log_err("user mismatch (%s)\n", pw->pw_name);
  +        log_err("user mismatch (%s instead of %s)\n", pw->pw_name, HTTPD_USER);
   	exit(103);
       }
   #endif /*_OSD_POSIX*/
  @@ -350,7 +350,7 @@
        * Log the transaction here to be sure we have an open log 
        * before we setuid().
        */
  -    log_err("uid: (%s/%s) gid: (%s/%s) %s\n",
  +    log_err("uid: (%s/%s) gid: (%s/%s) cmd: %s\n",
   	    target_uname, actual_uname,
   	    target_gname, actual_gname,
   	    cmd);