[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 88ce192ef59cd41e89efa9e46f578de7f1ffbf0b
Author: aCaB <acab at clamav.net>
Date:   Sat Feb 6 16:03:59 2010 +0100

    bb#1812

diff --git a/ChangeLog b/ChangeLog
index ebf045d..b794e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb  6 16:02:28 CET 2010 (acab)
+-----------------------------------
+ * clamd/server-th.c: reset the selfcheck timeout even if we reload
+		      by other means (bb#1812)
+
 Thu Feb  4 22:17:49 CET 2010 (acab)
 -----------------------------------
  * clamd: new options LocalSocketMode and LocalSocketGroup
diff --git a/clamd/server-th.c b/clamd/server-th.c
index b381c0b..07c60bb 100644
--- a/clamd/server-th.c
+++ b/clamd/server-th.c
@@ -1129,7 +1129,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
 	    if (!buf->got_newdata)
 		continue;
 
-#ifndef _WIN32 //FIXME
+#ifndef _WIN32
 	    if (buf->fd == acceptdata.syncpipe_wake_recv[0]) {
 		/* dummy sync pipe, just to wake us */
 		if (read(buf->fd, buff, sizeof(buff)) < 0) {
@@ -1301,6 +1301,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
 		pthread_create(&clamuko_pid, &clamuko_attr, clamukoth, tharg);
 	    }
 #endif
+	    time(&start_time);
 	} else {
 	    pthread_mutex_unlock(&reload_mutex);
 	}

-- 
Debian repository for ClamAV