X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fclient.c;h=f1731213aeca2545855579c48be90c75b8065911;hb=6c21fc1d9e0619908e0b02006309ef59a8498cb3;hp=814ee0ff79d48bc17d80ff4fc9b188e064db2c14;hpb=2b77e3c43fc9de8c26de073a09f20357ff559e1a;p=doldaconnect.git

diff --git a/daemon/client.c b/daemon/client.c
index 814ee0f..f173121 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -76,7 +76,11 @@ static struct scanstate *scanjob = NULL;
 static struct scanqueue *scanqueue = NULL;
 static struct sharepoint *shares = NULL;
 static struct hashcache *hashcache = NULL;
-static pid_t hashjob = 0;
+/* Set initially to -1, but changed to 0 the first time run() is
+ * called. This is to avoid forking a hash job before daemonizing,
+ * since that would make the daemon unable to wait() for the hash
+ * job. */
+static pid_t hashjob = -1;
 struct sharecache *shareroot = NULL;
 unsigned long long sharesize = 0;
 GCBCHAIN(sharechangecb, unsigned long long);
@@ -928,7 +932,7 @@ int doscan(int quantum)
 	    }
 	    type = FILE_REG;
 	} else {
-	    flog(LOG_WARNING, "unhandled file type: %i", sb.st_mode);
+	    flog(LOG_WARNING, "unhandled file type: 0%o", sb.st_mode);
 	    free(wcs);
 	    continue;
 	}
@@ -1051,6 +1055,11 @@ static int init(int hup)
 
 static int run(void)
 {
+    if(hashjob == -1)
+    {
+	hashjob = 0;
+	checkhashes();
+    }
     return(doscan(10));
 }