httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@hyperreal.org
Subject cvs commit: apache-1.3/src/support suexec.c
Date Thu, 18 Jun 1998 19:06:58 GMT
coar        98/06/18 12:06:57

  Modified:    src/support suexec.c
  Log:
  	A wee bit of cleanup (cosmetic only).
  
  Revision  Changes    Path
  1.39      +8 -7      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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- suexec.c	1998/04/21 20:14:06	1.38
  +++ suexec.c	1998/06/18 19:06:56	1.39
  @@ -161,12 +161,13 @@
       time_t timevar;
       struct tm *lt;
   
  -    if (!log)
  +    if (!log) {
   	if ((log = fopen(LOG_EXEC, "a")) == NULL) {
   	    fprintf(stderr, "failed to open log file\n");
   	    perror("fopen");
   	    exit(1);
   	}
  +    }
   
       time(&timevar);
       lt = localtime(&timevar);
  @@ -215,7 +216,8 @@
   	}
   	else {
   	    for (idx = 0; safe_env_lst[idx]; idx++) {
  -		if (!strncmp(*ep, safe_env_lst[idx], strlen(safe_env_lst[idx]))) {
  +		if (!strncmp(*ep, safe_env_lst[idx],
  +			     strlen(safe_env_lst[idx]))) {
   		    cleanenv[cidx] = *ep;
   		    cidx++;
   		    break;
  @@ -239,8 +241,8 @@
       char *target_uname;		/* target user name          */
       char *target_gname;		/* target group name         */
       char *target_homedir;	/* target home directory     */
  -    char *actual_uname;		/* actual user name            */
  -    char *actual_gname;		/* actual group name           */
  +    char *actual_uname;		/* actual user name          */
  +    char *actual_gname;		/* actual group name         */
       char *prog;			/* name of this program      */
       char *cmd;			/* command to be executed    */
       char cwd[AP_MAXPATH];	/* current working directory */
  @@ -250,8 +252,6 @@
       struct stat dir_info;	/* directory info holder     */
       struct stat prg_info;	/* program info holder       */
   
  -
  -
       /*
        * If there are a proper number of arguments, set
        * all of them to variables.  Otherwise, error out.
  @@ -476,7 +476,8 @@
   	(gid != dir_info.st_gid) ||
   	(uid != prg_info.st_uid) ||
   	(gid != prg_info.st_gid)) {
  -	log_err("target uid/gid (%ld/%ld) mismatch with directory (%ld/%ld) or program (%ld/%ld)\n",
  +	log_err("target uid/gid (%ld/%ld) mismatch "
  +		"with directory (%ld/%ld) or program (%ld/%ld)\n",
   		uid, gid,
   		dir_info.st_uid, dir_info.st_gid,
   		prg_info.st_uid, prg_info.st_gid);
  
  
  

Mime
View raw message