X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallscgi.c;h=ba598fdf2af136100030d19764d7806b85e32e90;hb=381f9919d2b5a84bb72b1dec33623c5e6bbf1f6e;hp=5965b5fbbf1d0147c3253fc7e08260a6842555aa;hpb=2d65add085285c9df22b9c9bf7d5f2521d9f61cd;p=ashd.git

diff --git a/src/callscgi.c b/src/callscgi.c
index 5965b5f..ba598fd 100644
--- a/src/callscgi.c
+++ b/src/callscgi.c
@@ -312,7 +312,7 @@ retry:
 	isanon = 0;
 	return(fd);
     } else {
-	flog(LOG_ERR, "servescgi: cannot use an anonymous socket without a program to start");
+	flog(LOG_ERR, "callscgi: cannot use an anonymous socket without a program to start");
 	exit(1);
     }
 }
@@ -428,6 +428,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)
@@ -578,6 +580,10 @@ static void listenloop(struct muth *muth, va_list args)
     }
 }
 
+static void sigign(int sig)
+{
+}
+
 static void sigexit(int sig)
 {
     exit(0);
@@ -585,7 +591,7 @@ static void sigexit(int sig)
 
 static void usage(FILE *out)
 {
-    fprintf(out, "usage: servescgi [-h] [-N RETRIES] [-i ID] [-u UNIX-PATH] [-t [HOST:]TCP-PORT] [PROGRAM [ARGS...]]\n");
+    fprintf(out, "usage: callscgi [-h] [-N RETRIES] [-i ID] [-u UNIX-PATH] [-t [HOST:]TCP-PORT] [PROGRAM [ARGS...]]\n");
 }
 
 int main(int argc, char **argv)
@@ -616,10 +622,11 @@ int main(int argc, char **argv)
     }
     progspec = argv + optind;
     if(((sockid != NULL) + (unspec != NULL) + (inspec != NULL)) > 1) {
-	flog(LOG_ERR, "servescgi: at most one of -i, -u or -t may be given");
+	flog(LOG_ERR, "callscgi: at most one of -i, -u or -t may be given");
 	exit(1);
     }
     signal(SIGCHLD, SIG_IGN);
+    signal(SIGPIPE, sigign);
     signal(SIGINT, sigexit);
     signal(SIGTERM, sigexit);
     mustart(listenloop, 0);