X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fproc.c;h=2c05608eb098eb313dcc085630d2cdd1d7a675dd;hb=470938bdc9149ae9c7befd0cd983f46fcc056192;hp=86464348f625fb125c7e3ce2a7114bc7e45f7fc2;hpb=0c345c82fe0465b7e92076b90e3132ae3b6eba98;p=ashd.git

diff --git a/lib/proc.c b/lib/proc.c
index 8646434..2c05608 100644
--- a/lib/proc.c
+++ b/lib/proc.c
@@ -22,6 +22,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 #include <ctype.h>
+#include <fcntl.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -33,7 +34,6 @@
 
 int stdmkchild(char **argv, void (*chinit)(void *), void *idata)
 {
-    int i;
     pid_t pid;
     int fd[2];
     
@@ -44,17 +44,15 @@ int stdmkchild(char **argv, void (*chinit)(void *), void *idata)
     if(pid == 0) {
 	if(chinit != NULL)
 	    chinit(idata);
-	for(i = 3; i < FD_SETSIZE; i++) {
-	    if(i != fd[0])
-		close(i);
-	}
 	dup2(fd[0], 0);
 	close(fd[0]);
+	close(fd[1]);
 	execvp(argv[0], argv);
 	flog(LOG_WARNING, "could not exec child program %s: %s", argv[0], strerror(errno));
 	exit(127);
     }
     close(fd[0]);
+    fcntl(fd[1], F_SETFD, FD_CLOEXEC);
     return(fd[1]);
 }
 
@@ -141,8 +139,7 @@ pid_t stdforkserve(char **argv, struct hthead *req, int fd, void (*chinit)(void
 	
 	dup2(fd, 0);
 	dup2(fd, 1);
-	for(i = 3; i < FD_SETSIZE; i++)
-	    close(i);
+	close(fd);
 	
 	bufinit(args);
 	for(i = 0; argv[i]; i++)