X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fcf.c;h=fd53c54991c2972ee7c524f1dc5a4d83adee07f3;hb=f2df7a1b1aeeb0cec2309aeb62fae051fd3c687c;hp=719fcad9ba162130119b4c0e3d0d32bdce96982b;hpb=13975be5892675874bea8c86d7d8140f5790e7e6;p=ashd.git

diff --git a/lib/cf.c b/lib/cf.c
index 719fcad..fd53c54 100644
--- a/lib/cf.c
+++ b/lib/cf.c
@@ -326,16 +326,16 @@ struct child *parsechild(struct cfstate *s)
     return(ch);
 }
 
-int childhandle(struct child *ch, struct hthead *req, int fd)
+int childhandle(struct child *ch, struct hthead *req, int fd, void (*chinit)(void *), void *idata)
 {
     if(ch->type == CH_SOCKET) {
 	if(ch->fd < 0)
-	    ch->fd = stdmkchild(ch->argv);
+	    ch->fd = stdmkchild(ch->argv, chinit, idata);
 	if(sendreq(ch->fd, req, fd)) {
-	    if(errno == EPIPE) {
+	    if((errno == EPIPE) || (errno == ECONNRESET)) {
 		/* Assume that the child has crashed and restart it. */
 		close(ch->fd);
-		ch->fd = stdmkchild(ch->argv);
+		ch->fd = stdmkchild(ch->argv, chinit, idata);
 		if(!sendreq(ch->fd, req, fd))
 		    return(0);
 	    }
@@ -345,7 +345,7 @@ int childhandle(struct child *ch, struct hthead *req, int fd)
 	    return(-1);
 	}
     } else if(ch->type == CH_FORK) {
-	if(stdforkserve(ch->argv, req, fd) < 0)
+	if(stdforkserve(ch->argv, req, fd, chinit, idata) < 0)
 	    return(-1);
     }
     return(0);