[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-167-g4319a8f

[acab]

The following commit has been merged in the debian/unstable branch:
commit 99c6ab4124dd39bcb2ae40968d8798846d0051b8
Author: acab <acab at 77e5149b-7576-45b1-b177-96237e5ba77b>
Date:   Fri Apr 17 16:24:46 2009 +0000

    spam syslog with start events (bb#1557)
    
    git-svn-id: http://svn.clamav.net/svn/clamav-devel/trunk@5048 77e5149b-7576-45b1-b177-96237e5ba77b

diff --git a/ChangeLog b/ChangeLog
index b1dd047..0762d3a 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 c66613a..9a28c9d 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;
 

-- 
Debian repository for ClamAV