X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fcf.c;h=f5defd7e37b10a02e1daea4aec0256befadcec81;hb=4dc7f716a7b4be064ecf86f6e1444b7b39dfdfe7;hp=38d98081a260e833c326fd782b3e68e9b2cb817e;hpb=1924fe8c26de2861744fd576631ad15da2759f51;p=ashd.git

diff --git a/lib/cf.c b/lib/cf.c
index 38d9808..f5defd7 100644
--- a/lib/cf.c
+++ b/lib/cf.c
@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <glob.h>
 #include <libgen.h>
+#include <sys/socket.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
@@ -232,22 +233,27 @@ void freecfparser(struct cfstate *s)
 
 char *findstdconf(char *name)
 {
-    char *path, *p, *p2, *t;
+    char *home, *path, *p, *p2, *t;
     
-    if((path = getenv("PATH")) == NULL)
-	return(NULL);
-    path = sstrdup(path);
-    for(p = strtok(path, ":"); p != NULL; p = strtok(NULL, ":")) {
-	if((p2 = strrchr(p, '/')) == NULL)
-	    continue;
-	*p2 = 0;
-	if(!access(t = sprintf2("%s/etc/%s", p, name), R_OK)) {
-	    free(path);
+    if((home = getenv("HOME")) != NULL) {
+	if(!access(t = sprintf2("%s/.ashd/etc/%s", home, name), R_OK))
 	    return(t);
-	}
 	free(t);
     }
-    free(path);
+    if((path = getenv("PATH")) != NULL) {
+	path = sstrdup(path);
+	for(p = strtok(path, ":"); p != NULL; p = strtok(NULL, ":")) {
+	    if((p2 = strrchr(p, '/')) == NULL)
+		continue;
+	    *p2 = 0;
+	    if(!access(t = sprintf2("%s/etc/%s", p, name), R_OK)) {
+		free(path);
+		return(t);
+	    }
+	    free(t);
+	}
+	free(path);
+    }
     return(NULL);
 }
 
@@ -305,21 +311,25 @@ static struct chandler stdhandler = {
 static int stdhandle(struct child *ch, struct hthead *req, int fd, void (*chinit)(void *), void *idata)
 {
     struct stdchild *i = ch->pdata;
+    int serr;
     
     if(i->type == CH_SOCKET) {
 	if(i->fd < 0)
 	    i->fd = stdmkchild(i->argv, chinit, idata);
-	if(sendreq(i->fd, req, fd)) {
-	    if((errno == EPIPE) || (errno == ECONNRESET)) {
+	if(sendreq2(i->fd, req, fd, MSG_NOSIGNAL | MSG_DONTWAIT)) {
+	    serr = errno;
+	    if((serr == EPIPE) || (serr == ECONNRESET)) {
 		/* Assume that the child has crashed and restart it. */
 		close(i->fd);
 		i->fd = stdmkchild(i->argv, chinit, idata);
-		if(!sendreq(i->fd, req, fd))
+		if(!sendreq2(i->fd, req, fd, MSG_NOSIGNAL | MSG_DONTWAIT))
 		    return(0);
 	    }
-	    flog(LOG_ERR, "could not pass on request to child %s: %s", ch->name, strerror(errno));
-	    close(i->fd);
-	    i->fd = -1;
+	    flog(LOG_ERR, "could not pass on request to child %s: %s", ch->name, strerror(serr));
+	    if(serr != EAGAIN) {
+		close(i->fd);
+		i->fd = -1;
+	    }
 	    return(-1);
 	}
     } else if(i->type == CH_FORK) {