X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallfcgi.c;h=a6d394569268fb53a8e9909e5a8697a9580627ea;hb=107aa2ef0fb1cc1b79d5ad832af02a2ee29a5cf8;hp=a394a42eca4c3fbefcd7dac96db6f8f9f7fb8971;hpb=5c2040da62c208e67836755465a4300683a06a49;p=ashd.git

diff --git a/src/callfcgi.c b/src/callfcgi.c
index a394a42..a6d3945 100644
--- a/src/callfcgi.c
+++ b/src/callfcgi.c
@@ -208,7 +208,7 @@ static void startlisten(void)
 	    close(i);
 	execvp(*progspec, progspec);
 	flog(LOG_ERR, "callfcgi: %s: %s", *progspec, strerror(errno));
-	exit(127);
+	_exit(127);
     }
     close(fd);
 }
@@ -226,13 +226,13 @@ static void startnolisten(void)
 	    close(i);
 	if((fd = open("/dev/null", O_RDONLY)) < 0) {
 	    flog(LOG_ERR, "/dev/null: %s", strerror(errno));
-	    exit(127);
+	    _exit(127);
 	}
 	dup2(fd, 0);
 	close(fd);
 	execvp(*progspec, progspec);
 	flog(LOG_ERR, "callfcgi: %s: %s", *progspec, strerror(errno));
-	exit(127);
+	_exit(127);
     }
 }
 
@@ -465,6 +465,8 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
 	bufaddenv(dst, "SERVER_NAME", "%s", h);
     if((h = getheader(req, "X-Ash-Server-Port")) != NULL)
 	bufaddenv(dst, "SERVER_PORT", "%s", h);
+    if((h = getheader(req, "X-Ash-Remote-User")) != NULL)
+	bufaddenv(dst, "REMOTE_USER", "%s", h);
     if(((h = getheader(req, "X-Ash-Protocol")) != NULL) && !strcmp(h, "https"))
 	bufaddenv(dst, "HTTPS", "on");
     if((h = getheader(req, "X-Ash-Address")) != NULL)
@@ -609,12 +611,12 @@ static int recvrec(FILE *in, int *type, int *rid, char **data, size_t *dlen)
 	return(-1);
     *data = smalloc(max(*dlen, 1));
     if(fread(*data, 1, *dlen, in) != *dlen) {
-	free(data);
+	free(*data);
 	return(-1);
     }
     for(; pl > 0; pl--) {
 	if(fgetc(in) == EOF) {
-	    free(data);
+	    free(*data);
 	    return(-1);
 	}
     }