X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daemon%2Fclient.c;h=c304d0137b9c2e8511cd9298bfee6f7fae830f45;hb=dfc72ce3ef0801b54a285abdd72b620a4dceb72e;hp=50da10dea9f8ff906b6a49a527f9014922fb4c60;hpb=e194f2fdfdde54a19e3e94a63f70580b6da0854a;p=doldaconnect.git

diff --git a/daemon/client.c b/daemon/client.c
index 50da10d..c304d01 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -278,10 +278,15 @@ static char *findhashcachefile(int filldef)
     }
     if(filldef)
     {
-	if(getenv("HOME") != NULL)
+	if((hcname = icswcstombs(confgetstr("cli", "hashcache"), NULL, NULL)) != NULL)
+	{
+	    strcpy(ret, hcname);
+	    return(ret);
+	} else if(getenv("HOME") != NULL) {
 	    snprintf(ret, sizeof(ret), "%s/.dc-hashcache", getenv("HOME"));
-	else
+	} else {
 	    snprintf(ret, sizeof(ret), "/etc/%s", hcname);
+	}
 	return(ret);
     } else {
 	return(NULL);
@@ -449,7 +454,7 @@ static void hashread(struct socket *sk, void *uudata)
     }
 }
 
-static void hashexit(pid_t pid, int status, void *uudata)
+static void hashexit(pid_t pid, int status, struct socket *outsock)
 {
     if(pid != hashjob)
 	flog(LOG_ERR, "BUG: hashing process changed PID?! old: %i new %i", hashjob, pid);
@@ -457,6 +462,7 @@ static void hashexit(pid_t pid, int status, void *uudata)
 	flog(LOG_WARNING, "hashing process exited with non-zero status: %i", status);
     hashjob = 0;
     checkhashes();
+    putsock(outsock);
 }
 
 static int hashfile(char *path)
@@ -525,7 +531,7 @@ static int hashfile(char *path)
     close(pfd[1]);
     outsock = wrapsock(pfd[0]);
     outsock->readcb = hashread;
-    childcallback(hashjob, hashexit, NULL);
+    childcallback(hashjob, (void (*)(pid_t, int, void *))hashexit, outsock);
     return(0);
 }