[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 a866b077aab87568e6313218527dc0a52203c845
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Wed Aug 5 18:34:21 2009 +0200

    clamd/clamd.c: ignore SIGHUP and SIGUSR2 during initial setup (bb#1671)

diff --git a/ChangeLog b/ChangeLog
index 2ef2f49..b1eb83b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug  5 18:33:11 CEST 2009 (tk)
+----------------------------------
+ * clamd/clamd.c: ignore SIGHUP and SIGUSR2 during initial setup (bb#1671)
+
 Wed Aug  5 16:27:06 CEST 2009 (tk)
 ----------------------------------
  * clamd, clamscan: add support for CrossFilesystems/--cross-fs (bb#1607)
diff --git a/clamd/clamd.c b/clamd/clamd.c
index 5f7dd14..0760fac 100644
--- a/clamd/clamd.c
+++ b/clamd/clamd.c
@@ -42,6 +42,7 @@
 #else
 #include <pwd.h>
 #include <grp.h>
+#include <signal.h>
 #endif
 
 #if defined(USE_SYSLOG) && !defined(C_AIX)
@@ -98,6 +99,7 @@ int main(int argc, char **argv)
 	const struct optstruct *opt;
 #ifndef	C_WINDOWS
         struct passwd *user = NULL;
+	struct sigaction sa;
 #endif
 	time_t currtime;
 	const char *dbdir, *cfgfile;
@@ -115,6 +117,11 @@ int main(int argc, char **argv)
 	mprintf("!Can't start the win32 pthreads layer\n");
         return 1;
     }
+#else
+    memset(&sa, 0, sizeof(sa));
+    sa.sa_handler = SIG_IGN;
+    sigaction(SIGHUP, &sa, NULL);
+    sigaction(SIGUSR2, &sa, NULL);
 #endif
 
     if((opts = optparse(NULL, argc, argv, 1, OPT_CLAMD, 0, NULL)) == NULL) {

-- 
Debian repository for ClamAV