From e9c4dd09b099b0cb7b13b8f1bdf2d1cf2cecf1ce Mon Sep 17 00:00:00 2001
From: aCaB <acab@clamav.net>
Date: Fri, 17 Apr 2009 16:24:46 +0000
Subject: [PATCH] spam syslog with start events (bb#1557)

git-svn: trunk@5048
---
 ChangeLog                     |  4 ++++
 clamav-milter/clamav-milter.c | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1dd047c2..0762d3aa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 17 18:23:44 CEST 2009 (acab)
+------------------------------------
+ * clamav-milter/clamav-milter.c: spam syslog with start events (bb#1557)
+
 Fri Apr 17 16:47:44 EEST 2009 (edwin)
 -------------------------------------
  * contrib/mpoolparse/mpoolparse.pl, contrib/mpoolparse/process.pl: 
diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
index c66613aec..9a28c9d81 100644
--- a/clamav-milter/clamav-milter.c
+++ b/clamav-milter/clamav-milter.c
@@ -51,6 +51,7 @@ int main(int argc, char **argv) {
     char *my_socket, *pt;
     const struct optstruct *opt;
     struct optstruct *opts;
+    time_t currtime;
     int ret;
 
     memset(&descr, 0, sizeof(struct smfiDesc));
@@ -160,7 +161,6 @@ int main(int argc, char **argv) {
     logg_verbose = mprintf_verbose = optget(opts, "LogVerbose")->enabled;
 
     if((opt = optget(opts, "LogFile"))->enabled) {
-	time_t currtime;
 	logg_file = opt->strarg;
 	if(strlen(logg_file) < 2 || logg_file[0] != '/') {
 	    fprintf(stderr, "ERROR: LogFile requires full path.\n");
@@ -168,13 +168,6 @@ int main(int argc, char **argv) {
 	    optfree(opts);
 	    return 1;
 	}
-	time(&currtime);
-	if(logg("#+++ Started at %s", ctime(&currtime))) {
-	    fprintf(stderr, "ERROR: Can't initialize the internal logger\n");
-	    logg_close();
-	    optfree(opts);
-	    return 1;
-	}
     } else
 	logg_file = NULL;
 
@@ -195,6 +188,13 @@ int main(int argc, char **argv) {
     }
 #endif
 
+    time(&currtime);
+    if(logg("#+++ Started at %s", ctime(&currtime))) {
+	fprintf(stderr, "ERROR: Can't initialize the internal logger\n");
+	logg_close();
+	optfree(opts);
+	return 1;
+    }
     if((opt = optget(opts, "TemporaryDirectory"))->enabled)
 	tempdir = opt->strarg;