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

+Tue Feb 17 17:09:24 GMT 2004 (trog)

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

+  * clamd: SIGHUP re-open log file support

+

 Tue Feb 17 09:59:03 GMT 2004 (njh)

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

   * libclamav: Added a new bounce delimeter

@@ -29,7 +33,7 @@ Sun Feb 15 14:10:19 CET 2004 (tk)

 Sun Feb 15 12:06:12 GMT 2004 (trog)

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

- * libclamav/vba_extract.c: Fix memory leak

+  * libclamav/vba_extract.c: Fix memory leak

 Sun Feb 15 12:52:25 CET 2004 (tk)

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

@@ -60,6 +60,7 @@ void logg_close(void) {

     pthread_mutex_lock(&logg_mutex);

     if (log_fd) {

 	fclose(log_fd);

+	log_fd = NULL;

     }

     pthread_mutex_unlock(&logg_mutex);

 #if defined(CLAMD_USE_SYSLOG) && !defined(C_AIX)

@@ -122,6 +123,7 @@ int logg(const char *str, ...)

 		    fprintf(log_fd, "Log size = %d, maximal = %d\n", (int) sb.st_size, logsize);

 		    fprintf(log_fd, "LOGGING DISABLED (Maximal log file size exceeded).\n");

 		    fclose(log_fd);

+		    log_fd = NULL;

 		    pthread_mutex_unlock(&logg_mutex);

 		    return 0;

 		}

@@ -28,7 +28,7 @@ void *mmalloc(size_t size);

 void *mcalloc(size_t nmemb, size_t size);

 void chomp(char *string);

-short int logverbose, logcompressed, loglock, logtime, sighup, logok, debug_mode;

+short int logverbose, logcompressed, loglock, logtime, logok, debug_mode;

 int logsize;

 const char *logfile;

 int logg(const char *str, ...);

@@ -39,6 +39,8 @@

 #include "clamuko.h"

 #include "tests.h"

+int sighup = 0;

+

 #define CMD1 "SCAN"

 #define CMD2 "RAWSCAN"

 #define CMD3 "QUIT"

@@ -38,6 +38,7 @@ int progexit = 0;

 pthread_mutex_t exit_mutex;

 int reload = 0;

 pthread_mutex_t reload_mutex;

+int sighup = 0;

 typedef struct client_conn_tag {

     int sd;

@@ -101,8 +102,8 @@ void sighandler_th(int sig)

 		break; /* not reached */

 	    case SIGHUP:

-		/* sighup = 1;

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

+		sighup = 1;

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

 		break;

     }

 }

@@ -384,13 +385,21 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	    continue;

 	}

-	client_conn = (client_conn_t *) mmalloc(sizeof(struct client_conn_tag));

-	client_conn->sd = new_sd;

-	client_conn->options = options;

-	client_conn->copt = copt;

-	client_conn->root = root;

-	client_conn->limits = &limits;

-	thrmgr_add(&thrmgr, client_conn);

+	if (sighup) {

+		logg("SIGHUP caught: re-opening log file.\n");

+		logg_close();

+		sighup = 0;

+	}

+

+	if (new_sd >= 0) {

+		client_conn = (client_conn_t *) mmalloc(sizeof(struct client_conn_tag));

+		client_conn->sd = new_sd;

+		client_conn->options = options;

+		client_conn->copt = copt;

+		client_conn->root = root;

+		client_conn->limits = &limits;

+		thrmgr_add(&thrmgr, client_conn);

+	}

 	pthread_mutex_lock(&exit_mutex);

 	if(progexit) {