@@ -1,3 +1,7 @@

+Tue Mar  2 13:04:15 GMT 2004 (trog)

+-----------------------------------

+  * clamd: intercept but ignore SIGPIPE, FreeBSD barfs

+

 Tue Mar  2 09:35:39 CET 2004 (tk)

 ---------------------------------

   * clamd: removed x86 dazuko object files (thanks to Fajar A. Nugraha

@@ -90,8 +90,6 @@ void scanner_thread(void *arg)

 void sighandler_th(int sig)

 {

-	//time_t currtime;

-

     switch(sig) {

 	case SIGINT:

 	case SIGTERM:

@@ -106,6 +104,9 @@ void sighandler_th(int sig)

 	case SIGHUP:

 	    sighup = 1;

 	    break;

+

+	default:

+	    break; /* Take no action on other signals - e.g. SIGPIPE */

     }

 }

@@ -343,6 +344,7 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     sigdelset(&sigset, SIGTERM);

     sigdelset(&sigset, SIGSEGV);

     sigdelset(&sigset, SIGHUP);

+    sigdelset(&sigset, SIGPIPE);

     sigprocmask(SIG_SETMASK, &sigset, NULL);

     /* SIGINT, SIGTERM, SIGSEGV */

@@ -351,14 +353,15 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     sigaddset(&sigact.sa_mask, SIGINT);

     sigaddset(&sigact.sa_mask, SIGTERM);

     sigaddset(&sigact.sa_mask, SIGHUP);

+    sigaddset(&sigact.sa_mask, SIGPIPE);

     sigaction(SIGINT, &sigact, NULL);

     sigaction(SIGTERM, &sigact, NULL);

-

+    sigaction(SIGHUP, &sigact, NULL);

+    sigaction(SIGPIPE, &sigact, NULL);

+    

     if(!debug_mode)

 	sigaction(SIGSEGV, &sigact, NULL);

-    sigaction(SIGHUP, &sigact, NULL);

-

 #if defined(C_BIGSTACK) || defined(C_BSD)

     /*

      * njh@bandsman.co.uk: