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

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 09196f45c7fed8f913009ec74086e5b58130fe33
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Mon Sep 14 13:58:11 2009 +0200

    clamd/server-th.c: fix possible race condition when restarting clamuko (bb#1692), patch from John Ogness

diff --git a/ChangeLog b/ChangeLog
index 85b56f5..16c17d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 14 13:56:42 CEST 2009 (tk)
+----------------------------------
+ * clamd/server-th.c: fix possible race condition when restarting clamuko
+		      (bb#1692), patch from John Ogness
+
 Fri Sep 11 16:05:00 CEST 2009 (tk)
 ----------------------------------
  * libclamav/matcher-ac.c: initial limited support for word boundary (bb#1631)
diff --git a/clamd/server-th.c b/clamd/server-th.c
index e21c0a9..a0a41b5 100644
--- a/clamd/server-th.c
+++ b/clamd/server-th.c
@@ -1253,6 +1253,13 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
 	pthread_mutex_lock(&reload_mutex);
 	if(reload) {
 	    pthread_mutex_unlock(&reload_mutex);
+#ifdef CLAMUKO
+	    if(optget(opts, "ClamukoScanOnAccess")->enabled && tharg) {
+		logg("Stopping and restarting Clamuko.\n");
+		pthread_kill(clamuko_pid, SIGUSR1);
+		pthread_join(clamuko_pid, NULL);
+	    }
+#endif
 	    engine = reload_db(engine, dboptions, opts, FALSE, &ret);
 	    if(ret) {
 		logg("Terminating because of a fatal error.\n");
@@ -1267,9 +1274,6 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi
 	    pthread_mutex_unlock(&reload_mutex);
 #ifdef CLAMUKO
 	    if(optget(opts, "ClamukoScanOnAccess")->enabled && tharg) {
-		logg("Stopping and restarting Clamuko.\n");
-		pthread_kill(clamuko_pid, SIGUSR1);
-		pthread_join(clamuko_pid, NULL);
 		tharg->engine = engine;
 		pthread_create(&clamuko_pid, &clamuko_attr, clamukoth, tharg);
 	    }

-- 
Debian repository for ClamAV