Browse code

spam syslog with start events (bb#1557)

git-svn: trunk@5048

aCaB authored on 2009/04/18 01:24:46
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Fri Apr 17 18:23:44 CEST 2009 (acab)
2
+------------------------------------
3
+ * clamav-milter/clamav-milter.c: spam syslog with start events (bb#1557)
4
+
1 5
 Fri Apr 17 16:47:44 EEST 2009 (edwin)
2 6
 -------------------------------------
3 7
  * contrib/mpoolparse/mpoolparse.pl, contrib/mpoolparse/process.pl: 
... ...
@@ -51,6 +51,7 @@ int main(int argc, char **argv) {
51 51
     char *my_socket, *pt;
52 52
     const struct optstruct *opt;
53 53
     struct optstruct *opts;
54
+    time_t currtime;
54 55
     int ret;
55 56
 
56 57
     memset(&descr, 0, sizeof(struct smfiDesc));
... ...
@@ -160,7 +161,6 @@ int main(int argc, char **argv) {
160 160
     logg_verbose = mprintf_verbose = optget(opts, "LogVerbose")->enabled;
161 161
 
162 162
     if((opt = optget(opts, "LogFile"))->enabled) {
163
-	time_t currtime;
164 163
 	logg_file = opt->strarg;
165 164
 	if(strlen(logg_file) < 2 || logg_file[0] != '/') {
166 165
 	    fprintf(stderr, "ERROR: LogFile requires full path.\n");
... ...
@@ -168,13 +168,6 @@ int main(int argc, char **argv) {
168 168
 	    optfree(opts);
169 169
 	    return 1;
170 170
 	}
171
-	time(&currtime);
172
-	if(logg("#+++ Started at %s", ctime(&currtime))) {
173
-	    fprintf(stderr, "ERROR: Can't initialize the internal logger\n");
174
-	    logg_close();
175
-	    optfree(opts);
176
-	    return 1;
177
-	}
178 171
     } else
179 172
 	logg_file = NULL;
180 173
 
... ...
@@ -195,6 +188,13 @@ int main(int argc, char **argv) {
195 195
     }
196 196
 #endif
197 197
 
198
+    time(&currtime);
199
+    if(logg("#+++ Started at %s", ctime(&currtime))) {
200
+	fprintf(stderr, "ERROR: Can't initialize the internal logger\n");
201
+	logg_close();
202
+	optfree(opts);
203
+	return 1;
204
+    }
198 205
     if((opt = optget(opts, "TemporaryDirectory"))->enabled)
199 206
 	tempdir = opt->strarg;
200 207