Browse code

bb#1812

aCaB authored on 2010/02/07 00:03:59
Showing 2 changed files
... ...
@@ -1,3 +1,8 @@
1
+Sat Feb  6 16:02:28 CET 2010 (acab)
2
+-----------------------------------
3
+ * clamd/server-th.c: reset the selfcheck timeout even if we reload
4
+		      by other means (bb#1812)
5
+
1 6
 Thu Feb  4 22:17:49 CET 2010 (acab)
2 7
 -----------------------------------
3 8
  * clamd: new options LocalSocketMode and LocalSocketGroup
... ...
@@ -1129,7 +1129,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
1129 1129
 	    if (!buf->got_newdata)
1130 1130
 		continue;
1131 1131
 
1132
-#ifndef _WIN32 //FIXME
1132
+#ifndef _WIN32
1133 1133
 	    if (buf->fd == acceptdata.syncpipe_wake_recv[0]) {
1134 1134
 		/* dummy sync pipe, just to wake us */
1135 1135
 		if (read(buf->fd, buff, sizeof(buff)) < 0) {
... ...
@@ -1301,6 +1301,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
1301 1301
 		pthread_create(&clamuko_pid, &clamuko_attr, clamukoth, tharg);
1302 1302
 	    }
1303 1303
 #endif
1304
+	    time(&start_time);
1304 1305
 	} else {
1305 1306
 	    pthread_mutex_unlock(&reload_mutex);
1306 1307
 	}