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

+Tue Nov 25 21:06:55 CET 2008 (tk)

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

+ * clamd: LogFileUnlock was not working correctly (bb#1304)

+

 Fri Nov 21 23:40:19 CET 2008 (tk)

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

  * freshclam/manager.c: add support for http proxy in SubmitDetectionStats

@@ -217,7 +217,7 @@ int main(int argc, char **argv)

 #endif

     /* initialize logger */

-    logg_lock = cfgopt(copt, "LogFileUnlock")->enabled;

+    logg_lock = !cfgopt(copt, "LogFileUnlock")->enabled;

     logg_time = cfgopt(copt, "LogTime")->enabled;

     logok = cfgopt(copt, "LogClean")->enabled;

     logg_size = cfgopt(copt, "LogFileMaxSize")->numarg;

@@ -237,7 +237,7 @@ int main(int argc, char **argv)

 	}

 	time(&currtime);

 	if(logg("#+++ Started at %s", cli_ctime(&currtime, timestr, sizeof(timestr)))) {

-	    fprintf(stderr, "ERROR: Problem with internal logger. Please check the permissions on the %s file.\n", logg_file);

+	    fprintf(stderr, "ERROR: Can't initialize the internal logger\n");

 	    logg_close();

 	    freecfg(copt);

 	    return 1;

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

 #ifdef CL_THREAD_SAFE

 		    pthread_mutex_unlock(&logg_mutex);

 #endif

+		    printf("ERROR: %s is locked by another process\n", logg_file);

 		    return -1;

 		}

 	    }