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

+Mon Mar  1 13:22:30 GMT 2004 (trog)

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

+  * clamd: Cleanup signal handling

+

 Mon Mar  1 13:08:04 GMT 2004 (trog)

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

   * clamd: Cleanup local socket and clamd.run on exit

@@ -29,6 +29,7 @@

 #include <time.h>

 #include <sys/types.h>

 #include <sys/socket.h>

+#include <unistd.h>

 #include "server.h"

 #include "thrmgr.h"

@@ -89,27 +90,22 @@ void scanner_thread(void *arg)

 void sighandler_th(int sig)

 {

-	time_t currtime;

+	//time_t currtime;

     switch(sig) {

 	case SIGINT:

 	case SIGTERM:

 	    progexit = 1;

-	    logg("*Signal %d caught -> exiting.\n", sig);

-	    time(&currtime);

-	    logg("--- Stopped at %s", ctime(&currtime));

-	    exit(0);

-	    break; /* not reached */

+	    break;

-	    case SIGSEGV:

-		logg("Segmentation fault :-( Bye..\n");

-		exit(11); /* probably not reached at all */

-		break; /* not reached */

+	case SIGSEGV:

+	    logg("Segmentation fault :-( Bye..\n");

+	    _exit(11); /* probably not reached at all */

+	    break; /* not reached */

-	    case SIGHUP:

-		sighup = 1;

-		/*logg("SIGHUP caught: log file re-opened.\n"); */

-		break;

+	case SIGHUP:

+	    sighup = 1;

+	    break;

     }

 }

@@ -483,5 +479,8 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     }

     logg("Exiting (clean)\n");

+    time(&current_time);

+    logg("--- Stopped at %s", ctime(&current_time));

+

     return 0;

 }