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

+Mon May 12 15:31:13 CEST 2008 (acab)

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

+  * clamd/server-th.c: minor fixes (bb#384)

+

 Sat May 10 10:18:41 EEST 2008 (edwin)

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

   * clamd/session.c: fix dummy prototype (bb #1019)

@@ -65,10 +65,10 @@

 #endif

 int progexit = 0;

-pthread_mutex_t exit_mutex;

+pthread_mutex_t exit_mutex = PTHREAD_MUTEX_INITIALIZER;

 int reload = 0;

 time_t reloaded_time = 0;

-pthread_mutex_t reload_mutex;

+pthread_mutex_t reload_mutex = PTHREAD_MUTEX_INITIALIZER;

 int sighup = 0;

 static struct cl_stat *dbstat = NULL;

@@ -306,7 +306,9 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	if((fd = fopen(cpt->strarg, "w")) == NULL) {

 	    logg("!Can't save PID in file %s\n", cpt->strarg);

 	} else {

-	    fprintf(fd, "%u", (unsigned int) mainpid);

+	    if (fprintf(fd, "%u", (unsigned int) mainpid)<0) {

+	    	logg("!Can't save PID in file %s\n", cpt->strarg);

+	    }

 	    fclose(fd);

 	}

 	umask(old_umask);

@@ -513,9 +515,6 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

     sigaction(SIGUSR2, &sigact, NULL);

 #endif

-    pthread_mutex_init(&exit_mutex, NULL);

-    pthread_mutex_init(&reload_mutex, NULL);

-

     idletimeout = cfgopt(copt, "IdleTimeout")->numarg;

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