@@ -1,3 +1,8 @@

+Fri Mar 19 21:42:51 CET 2004 (tk)

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

+  * clamd: thrmgr.c, server-th.c: added missing new line characters in logg()

+	   (reported by Sergey <a_s_y*sama.ru>)

+

 Fri Mar 19 17:48:31 GMT 2004 (njh)

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

   * libclamav/message.c:	Handle "binary encoding" (whatever that is :-)

@@ -52,6 +52,7 @@ have been reviewed by our team):

     + qscanq - Virus Scanning for Qmail

     + clamavr - Ruby binding for ClamAV

     + DansGuardian Anti-Virus Plugin

+    + Viralator - a Perl script that virus scans http downloads

     + ClamAssassin - a filter for procmail

     + Gadoyanvirus - a filter for Qmail

     + OpenProtect - a complete e-mail protection solution

@@ -52,6 +52,7 @@ have been reviewed by our team):

     + qscanq - Virus Scanning for Qmail

     + clamavr - Ruby binding for ClamAV

     + DansGuardian Anti-Virus Plugin

+    + Viralator - a Perl script that virus scans http downloads

     + ClamAssassin - a filter for procmail

     + Gadoyanvirus - a filter for Qmail

     + OpenProtect - a complete e-mail protection solution

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

     pthread_mutex_init(&reload_mutex, NULL);

     if((thr_pool=thrmgr_new(max_threads, 30, scanner_thread)) == NULL) {

-	logg("thrmgr_new failed");

+	logg("!thrmgr_new failed\n");

 	exit(-1);

     }

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

 	if((new_sd == -1) && (errno != EINTR)) {

 	    /* very bad - need to exit or restart */

 #ifdef HAVE_STRERROR_R

-	    logg("!accept() failed: %s", strerror_r(errno, buff, BUFFSIZE));

+	    logg("!accept() failed: %s\n", strerror_r(errno, buff, BUFFSIZE));

 #else

 	    logg("!accept() failed\n");

 #endif

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

 		if (!thrmgr_dispatch(thr_pool, client_conn)) {

 		    close(client_conn->sd);

 		    free(client_conn);

-		    logg("!thread dispatch failed");

+		    logg("!thread dispatch failed\n");

 		}

 	}

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

 	    thrmgr_destroy(thr_pool);

 	    root = reload_db(root, copt, FALSE);

 	    if((thr_pool=thrmgr_new(max_threads, 30, scanner_thread)) == NULL) {

-		logg("!thrmgr_new failed");

+		logg("!thrmgr_new failed\n");

 		pthread_mutex_unlock(&reload_mutex);

 		exit(-1);

 	    }

@@ -85,7 +85,7 @@ void thrmgr_destroy(threadpool_t *threadpool)

 		return;

 	}

   	if (pthread_mutex_lock(&threadpool->pool_mutex) != 0) {

-   		logg("!Mutex lock failed");

+   		logg("!Mutex lock failed\n");

     		exit(-1);

 	}

 	threadpool->state = POOL_EXIT;

@@ -104,7 +104,7 @@ void thrmgr_destroy(threadpool_t *threadpool)

 		}

 	}

   	if (pthread_mutex_unlock(&threadpool->pool_mutex) != 0) {

-    		logg("!Mutex unlock failed");

+    		logg("!Mutex unlock failed\n");

     		exit(-1);

   	}

@@ -167,7 +167,7 @@ void *thrmgr_worker(void *arg)

 	for (;;) {

 		if (pthread_mutex_lock(&(threadpool->pool_mutex)) != 0) {

 			/* Fatal error */

-			logg("!Fatal: mutex lock failed");

+			logg("!Fatal: mutex lock failed\n");

 			exit(-2);

 		}

 		timeout.tv_sec = time(NULL) + threadpool->idle_timeout;

@@ -190,7 +190,7 @@ void *thrmgr_worker(void *arg)

 		if (pthread_mutex_unlock(&(threadpool->pool_mutex)) != 0) {

 			/* Fatal error */

-			logg("!Fatal: mutex unlock failed");

+			logg("!Fatal: mutex unlock failed\n");

 			exit(-2);

 		}

 		if (job_data) {

@@ -201,7 +201,7 @@ void *thrmgr_worker(void *arg)

 	}

 	if (pthread_mutex_lock(&(threadpool->pool_mutex)) != 0) {

 		/* Fatal error */

-		logg("!Fatal: mutex lock failed");

+		logg("!Fatal: mutex lock failed\n");

 		exit(-2);

 	}

 	threadpool->thr_alive--;

@@ -211,7 +211,7 @@ void *thrmgr_worker(void *arg)

 	}

 	if (pthread_mutex_unlock(&(threadpool->pool_mutex)) != 0) {

 		/* Fatal error */

-		logg("!Fatal: mutex unlock failed");

+		logg("!Fatal: mutex unlock failed\n");

 		exit(-2);

 	}

 	return NULL;

@@ -227,7 +227,7 @@ int thrmgr_dispatch(threadpool_t *threadpool, void *user_data)

 	/* Lock the threadpool */

 	if (pthread_mutex_lock(&(threadpool->pool_mutex)) != 0) {

-		logg("!Mutex lock failed");

+		logg("!Mutex lock failed\n");

 		return FALSE;

 	}

@@ -241,7 +241,7 @@ int thrmgr_dispatch(threadpool_t *threadpool, void *user_data)

 		/* Start a new thread */

 		if (pthread_create(&thr_id, &(threadpool->pool_attr),

 				thrmgr_worker, threadpool) != 0) {

-			logg("!pthread_create failed");

+			logg("!pthread_create failed\n");

 		} else {

 			threadpool->thr_alive++;

 		}

@@ -249,7 +249,7 @@ int thrmgr_dispatch(threadpool_t *threadpool, void *user_data)

 	pthread_cond_signal(&(threadpool->pool_cond));

 	if (pthread_mutex_unlock(&(threadpool->pool_mutex)) != 0) {

-		logg("!Mutex unlock failed");

+		logg("!Mutex unlock failed\n");

 		return FALSE;

 	}

 	return TRUE;