Browse code

Remove scanmail requirement

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@980 77e5149b-7576-45b1-b177-96237e5ba77b

Nigel Horne authored on 2004/10/08 00:38:16
Showing 4 changed files
... ...
@@ -1,3 +1,8 @@
1
+Thu Oct  7 16:37:04 BST 2004 (njh)
2
+----------------------------------
3
+  * clamav-milter:	Requirement for ScanMail removed since that is no
4
+  				longer supported in clamd.conf
5
+
1 6
 Thu Oct  7 12:18:59 BST 2004 (trog)
2 7
 -----------------------------------
3 8
   * libclamav/filetypes.c: Add more HTML markers
... ...
@@ -515,6 +515,8 @@ Changes
515 515
 0.80g	4/10/04	Enhanced the SMTP reply
516 516
 0.80h	4/10/04	Fix mails containing viruses being kept twice in quarantine;
517 517
 			once as 'msg.xxxxxx' and once as 'msg.xxxxxx.virusname'
518
+0.80i	5/10/04	ScanMail is no longer needed
519
+		Improved tracing of the infected machine
518 520
 
519 521
 INTERNATIONALISATION
520 522
 
... ...
@@ -26,6 +26,9 @@
26 26
  *
27 27
  * Change History:
28 28
  * $Log: clamav-milter.c,v $
29
+ * Revision 1.140  2004/10/07 15:36:43  nigelhorne
30
+ * Remove scanmail requirement
31
+ *
29 32
  * Revision 1.139  2004/10/04 12:37:11  nigelhorne
30 33
  * Fix quarantine files being saved twice
31 34
  *
... ...
@@ -428,9 +431,9 @@
428 428
  * Revision 1.6  2003/09/28 16:37:23  nigelhorne
429 429
  * Added -f flag use MaxThreads if --max-children not set
430 430
  */
431
-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.139 2004/10/04 12:37:11 nigelhorne Exp $";
431
+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.140 2004/10/07 15:36:43 nigelhorne Exp $";
432 432
 
433
-#define	CM_VERSION	"0.80h"
433
+#define	CM_VERSION	"0.80i"
434 434
 
435 435
 /*#define	CONFDIR	"/usr/local/etc"*/
436 436
 
... ...
@@ -1234,16 +1237,6 @@ main(int argc, char **argv)
1234 1234
 		return EX_CONFIG;
1235 1235
 	}
1236 1236
 
1237
-	if(!cfgopt(copt, "ScanMail")) {
1238
-		/*
1239
-		 * In fact ScanMail isn't needed if this machine doesn't run
1240
-		 * clamd.
1241
-		 */
1242
-		fprintf(stderr, _("%s: ScanMail not enabled in %s\n"),
1243
-			argv[0], cfgfile);
1244
-		return EX_CONFIG;
1245
-	}
1246
-
1247 1237
 	/*
1248 1238
 	 * patch from "Richard G. Roberto" <rgr@dedlegend.com>
1249 1239
 	 * If the --max-children flag isn't set, see if MaxThreads
... ...
@@ -2190,7 +2183,8 @@ clamfi_header(SMFICTX *ctx, char *headerf, char *headerv)
2190 2190
 	if(hflag)
2191 2191
 		header_list_add(privdata->headers, headerf, headerv);
2192 2192
 	else if((strcasecmp(headerf, "Received") == 0) &&
2193
-		(strncasecmp(headerv, "from ", 5) == 0)) {
2193
+		(strncasecmp(headerv, "from ", 5) == 0) &&
2194
+		(strstr(headerv, "localhost") != 0)) {
2194 2195
 		if(privdata->received)
2195 2196
 			free(privdata->received);
2196 2197
 		privdata->received = strdup(headerv);
... ...
@@ -8,7 +8,7 @@ msgid ""
8 8
 msgstr ""
9 9
 "Project-Id-Version: PACKAGE VERSION\n"
10 10
 "Report-Msgid-Bugs-To: bugs@clamav.net\n"
11
-"POT-Creation-Date: 2004-10-04 11:43+0100\n"
11
+"POT-Creation-Date: 2004-10-07 16:36+0100\n"
12 12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
@@ -16,567 +16,562 @@ msgstr ""
16 16
 "Content-Type: text/plain; charset=CHARSET\n"
17 17
 "Content-Transfer-Encoding: 8bit\n"
18 18
 
19
-#: clamav-milter.c:789
19
+#: clamav-milter.c:795
20 20
 msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them."
21 21
 msgstr ""
22 22
 
23
-#: clamav-milter.c:790
23
+#: clamav-milter.c:796
24 24
 msgid "\t--bounce\t\t-b\tSend a failure message to the sender."
25 25
 msgstr ""
26 26
 
27
-#: clamav-milter.c:791
27
+#: clamav-milter.c:797
28 28
 msgid ""
29 29
 "\t--broadcast\t\t-B [IFACE]\tBroadcast to a network manager when a virus is "
30 30
 "found."
31 31
 msgstr ""
32 32
 
33
-#: clamav-milter.c:792
33
+#: clamav-milter.c:798
34 34
 msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE."
35 35
 msgstr ""
36 36
 
37
-#: clamav-milter.c:793
37
+#: clamav-milter.c:799
38 38
 msgid "\t--debug\t\t\t-D\tPrint debug messages."
39 39
 msgstr ""
40 40
 
41
-#: clamav-milter.c:794
41
+#: clamav-milter.c:800
42 42
 msgid ""
43 43
 "\t--dont-log-clean\t-C\tDon't add an entry to syslog that a mail is clean."
44 44
 msgstr ""
45 45
 
46
-#: clamav-milter.c:795
46
+#: clamav-milter.c:801
47 47
 msgid ""
48 48
 "\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error "
49 49
 "occurs."
50 50
 msgstr ""
51 51
 
52
-#: clamav-milter.c:796
52
+#: clamav-milter.c:802
53 53
 msgid "\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded."
54 54
 msgstr ""
55 55
 
56
-#: clamav-milter.c:797
56
+#: clamav-milter.c:803
57 57
 msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."
58 58
 msgstr ""
59 59
 
60
-#: clamav-milter.c:798
60
+#: clamav-milter.c:804
61 61
 msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)."
62 62
 msgstr ""
63 63
 
64
-#: clamav-milter.c:799
64
+#: clamav-milter.c:805
65 65
 msgid "\t--help\t\t\t-h\tThis message."
66 66
 msgstr ""
67 67
 
68
-#: clamav-milter.c:800
68
+#: clamav-milter.c:806
69 69
 msgid "\t--headers\t\t-H\tInclude original message headers in the report."
70 70
 msgstr ""
71 71
 
72
-#: clamav-milter.c:801
72
+#: clamav-milter.c:807
73 73
 msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN."
74 74
 msgstr ""
75 75
 
76
-#: clamav-milter.c:802
76
+#: clamav-milter.c:808
77 77
 msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans."
78 78
 msgstr ""
79 79
 
80
-#: clamav-milter.c:803
80
+#: clamav-milter.c:809
81 81
 msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine."
82 82
 msgstr ""
83 83
 
84
-#: clamav-milter.c:804
84
+#: clamav-milter.c:810
85 85
 msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."
86 86
 msgstr ""
87 87
 
88
-#: clamav-milter.c:805
88
+#: clamav-milter.c:811
89 89
 msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."
90 90
 msgstr ""
91 91
 
92
-#: clamav-milter.c:806
92
+#: clamav-milter.c:812
93 93
 msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."
94 94
 msgstr ""
95 95
 
96
-#: clamav-milter.c:807
96
+#: clamav-milter.c:813
97 97
 msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."
98 98
 msgstr ""
99 99
 
100
-#: clamav-milter.c:808
100
+#: clamav-milter.c:814
101 101
 msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster."
102 102
 msgstr ""
103 103
 
104
-#: clamav-milter.c:809
104
+#: clamav-milter.c:815
105 105
 msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."
106 106
 msgstr ""
107 107
 
108
-#: clamav-milter.c:810
108
+#: clamav-milter.c:816
109 109
 msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account."
110 110
 msgstr ""
111 111
 
112
-#: clamav-milter.c:811
112
+#: clamav-milter.c:817
113 113
 msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."
114 114
 msgstr ""
115 115
 
116
-#: clamav-milter.c:812
116
+#: clamav-milter.c:818
117 117
 msgid ""
118 118
 "\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running "
119 119
 "clamd (when using TCPsocket)."
120 120
 msgstr ""
121 121
 
122
-#: clamav-milter.c:813
122
+#: clamav-milter.c:819
123 123
 msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."
124 124
 msgstr ""
125 125
 
126
-#: clamav-milter.c:814
126
+#: clamav-milter.c:820
127 127
 msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file."
128 128
 msgstr ""
129 129
 
130
-#: clamav-milter.c:815
130
+#: clamav-milter.c:821
131 131
 msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."
132 132
 msgstr ""
133 133
 
134
-#: clamav-milter.c:816
134
+#: clamav-milter.c:822
135 135
 msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die."
136 136
 msgstr ""
137 137
 
138
-#: clamav-milter.c:817
138
+#: clamav-milter.c:823
139 139
 msgid "\t--version\t\t-V\tPrint the version number of this software."
140 140
 msgstr ""
141 141
 
142
-#: clamav-milter.c:819
142
+#: clamav-milter.c:825
143 143
 msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'."
144 144
 msgstr ""
145 145
 
146
-#: clamav-milter.c:821
146
+#: clamav-milter.c:827
147 147
 msgid ""
148 148
 "\n"
149 149
 "For more information type \"man clamav-milter\"."
150 150
 msgstr ""
151 151
 
152
-#: clamav-milter.c:822
152
+#: clamav-milter.c:828
153 153
 msgid "Report bugs to bugs@clamav.net."
154 154
 msgstr ""
155 155
 
156
-#: clamav-milter.c:1103
156
+#: clamav-milter.c:1109
157 157
 #, c-format
158 158
 msgid "%s: No socket-addr given\n"
159 159
 msgstr ""
160 160
 
161
-#: clamav-milter.c:1112
161
+#: clamav-milter.c:1118
162 162
 #, c-format
163 163
 msgid "%s: Can't parse the config file %s\n"
164 164
 msgstr ""
165 165
 
166
-#: clamav-milter.c:1152
166
+#: clamav-milter.c:1158
167 167
 #, c-format
168 168
 msgid ""
169 169
 "%s: The iface option to --broadcast is not supported on your operating "
170 170
 "system\n"
171 171
 msgstr ""
172 172
 
173
-#: clamav-milter.c:1156
173
+#: clamav-milter.c:1162
174 174
 #, c-format
175 175
 msgid "%s: Can't get information about user %s\n"
176 176
 msgstr ""
177 177
 
178
-#: clamav-milter.c:1167
178
+#: clamav-milter.c:1173
179 179
 #, c-format
180 180
 msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n"
181 181
 msgstr ""
182 182
 
183
-#: clamav-milter.c:1184
183
+#: clamav-milter.c:1190
184 184
 #, c-format
185 185
 msgid "Running as user %s (UID %d, GID %d)\n"
186 186
 msgstr ""
187 187
 
188
-#: clamav-milter.c:1187
188
+#: clamav-milter.c:1193
189 189
 #, c-format
190 190
 msgid "%s: running as root is not recommended (check \"User\" in clamd.conf)\n"
191 191
 msgstr ""
192 192
 
193
-#: clamav-milter.c:1189
193
+#: clamav-milter.c:1195
194 194
 #, c-format
195 195
 msgid "%s: Only root can set an interface for --broadcast\n"
196 196
 msgstr ""
197 197
 
198
-#: clamav-milter.c:1194
198
+#: clamav-milter.c:1200
199 199
 #, c-format
200 200
 msgid "%s: Advisory mode doesn't work with quarantine mode\n"
201 201
 msgstr ""
202 202
 
203
-#: clamav-milter.c:1201
203
+#: clamav-milter.c:1207
204 204
 #, c-format
205 205
 msgid "%s: Advisory mode doesn't work with quarantine directories\n"
206 206
 msgstr ""
207 207
 
208
-#: clamav-milter.c:1217
208
+#: clamav-milter.c:1223
209 209
 #, c-format
210 210
 msgid "%s: insecure quarantine directory %s (mode 0%o)\n"
211 211
 msgstr ""
212 212
 
213
-#: clamav-milter.c:1236
214
-#, c-format
215
-msgid "%s: ScanMail not enabled in %s\n"
216
-msgstr ""
217
-
218
-#: clamav-milter.c:1253
213
+#: clamav-milter.c:1249
219 214
 #, c-format
220 215
 msgid "%s: ReadTimeout must not be negative in %s\n"
221 216
 msgstr ""
222 217
 
223
-#: clamav-milter.c:1260
218
+#: clamav-milter.c:1256
224 219
 #, c-format
225 220
 msgid "%s: StreamMaxLength must not be negative in %s\n"
226 221
 msgstr ""
227 222
 
228
-#: clamav-milter.c:1275
223
+#: clamav-milter.c:1271
229 224
 #, c-format
230 225
 msgid "%s: You can select one server type only (local/TCP) in %s\n"
231 226
 msgstr ""
232 227
 
233
-#: clamav-milter.c:1285 clamav-milter.c:1308
228
+#: clamav-milter.c:1281 clamav-milter.c:1304
234 229
 #, c-format
235 230
 msgid "Can't talk to clamd server via %s\n"
236 231
 msgstr ""
237 232
 
238
-#: clamav-milter.c:1287 clamav-milter.c:1310
233
+#: clamav-milter.c:1283 clamav-milter.c:1306
239 234
 #, c-format
240 235
 msgid "Check your entry for LocalSocket in %s\n"
241 236
 msgstr ""
242 237
 
243
-#: clamav-milter.c:1321
238
+#: clamav-milter.c:1317
244 239
 msgid "Can't create a clamd session"
245 240
 msgstr ""
246 241
 
247
-#: clamav-milter.c:1333
242
+#: clamav-milter.c:1329
248 243
 #, c-format
249 244
 msgid ""
250 245
 "%s: --quarantine-dir not supported for remote scanning - use --quarantine\n"
251 246
 msgstr ""
252 247
 
253
-#: clamav-milter.c:1360
248
+#: clamav-milter.c:1356
254 249
 #, c-format
255 250
 msgid "%s: Sessions does not multiplex\n"
256 251
 msgstr ""
257 252
 
258
-#: clamav-milter.c:1376
253
+#: clamav-milter.c:1372
259 254
 #, c-format
260 255
 msgid "%s: Unknown host %s\n"
261 256
 msgstr ""
262 257
 
263
-#: clamav-milter.c:1388
258
+#: clamav-milter.c:1384
264 259
 #, c-format
265 260
 msgid "Can't talk to clamd server %s on port %d\n"
266 261
 msgstr ""
267 262
 
268
-#: clamav-milter.c:1403
263
+#: clamav-milter.c:1399
269 264
 msgid "Can't find any clamd servers\n"
270 265
 msgstr ""
271 266
 
272
-#: clamav-milter.c:1404
267
+#: clamav-milter.c:1400
273 268
 #, c-format
274 269
 msgid "Check your entry for TCPSocket in %s\n"
275 270
 msgstr ""
276 271
 
277
-#: clamav-milter.c:1410
272
+#: clamav-milter.c:1406
278 273
 #, c-format
279 274
 msgid "%s: You must select server type (local/TCP) in %s\n"
280 275
 msgstr ""
281 276
 
282
-#: clamav-milter.c:1417
277
+#: clamav-milter.c:1413
283 278
 #, c-format
284 279
 msgid "When debugging it is recommended that you use Foreground mode in %s\n"
285 280
 msgstr ""
286 281
 
287
-#: clamav-milter.c:1418
282
+#: clamav-milter.c:1414
288 283
 msgid "So that you can see all of the messages"
289 284
 msgstr ""
290 285
 
291
-#: clamav-milter.c:1479
286
+#: clamav-milter.c:1475
292 287
 #, c-format
293 288
 msgid "Starting: %s"
294 289
 msgstr ""
295 290
 
296
-#: clamav-milter.c:1484
291
+#: clamav-milter.c:1480
297 292
 msgid "Debugging is on"
298 293
 msgstr ""
299 294
 
300
-#: clamav-milter.c:1488
295
+#: clamav-milter.c:1484
301 296
 #, c-format
302 297
 msgid ""
303 298
 "%s: (-q && !LogSyslog): warning - all interception message methods are off\n"
304 299
 msgstr ""
305 300
 
306
-#: clamav-milter.c:1492
301
+#: clamav-milter.c:1488
307 302
 msgid "Starting clamav-milter"
308 303
 msgstr ""
309 304
 
310
-#: clamav-milter.c:1501
305
+#: clamav-milter.c:1497
311 306
 #, c-format
312 307
 msgid "Can't save PID in file %s"
313 308
 msgstr ""
314 309
 
315
-#: clamav-milter.c:1503
310
+#: clamav-milter.c:1499
316 311
 #, c-format
317 312
 msgid "Can't save PID in file %s\n"
318 313
 msgstr ""
319 314
 
320
-#: clamav-milter.c:1531
315
+#: clamav-milter.c:1527
321 316
 #, c-format
322 317
 msgid "%s: smfi_setconn failed\n"
323 318
 msgstr ""
324 319
 
325
-#: clamav-milter.c:1544
320
+#: clamav-milter.c:1540
326 321
 #, c-format
327 322
 msgid "Started: %s"
328 323
 msgstr ""
329 324
 
330
-#: clamav-milter.c:1581 clamav-milter.c:1813
325
+#: clamav-milter.c:1577 clamav-milter.c:1809
331 326
 #, c-format
332 327
 msgid "Check clamd server %s - it may be down\n"
333 328
 msgstr ""
334 329
 
335
-#: clamav-milter.c:1584 clamav-milter.c:1820
330
+#: clamav-milter.c:1580 clamav-milter.c:1816
336 331
 msgid "Check clamd server - it may be down\n"
337 332
 msgstr ""
338 333
 
339
-#: clamav-milter.c:1745
334
+#: clamav-milter.c:1741
340 335
 msgid "No free clamd sessions\n"
341 336
 msgstr ""
342 337
 
343
-#: clamav-milter.c:1816
338
+#: clamav-milter.c:1812
344 339
 #, c-format
345 340
 msgid "Check clamd server %s - it may be down"
346 341
 msgstr ""
347 342
 
348
-#: clamav-milter.c:1856
343
+#: clamav-milter.c:1852
349 344
 msgid "findServer: select failed"
350 345
 msgstr ""
351 346
 
352
-#: clamav-milter.c:1865
347
+#: clamav-milter.c:1861
353 348
 #, c-format
354 349
 msgid "findServer: using server %d\n"
355 350
 msgstr ""
356 351
 
357
-#: clamav-milter.c:1870
352
+#: clamav-milter.c:1866
358 353
 msgid "findServer: No response from any server\n"
359 354
 msgstr ""
360 355
 
361
-#: clamav-milter.c:1872
356
+#: clamav-milter.c:1868
362 357
 msgid "findServer: No response from any server"
363 358
 msgstr ""
364 359
 
365
-#: clamav-milter.c:1893
360
+#: clamav-milter.c:1889
366 361
 msgid "clamfi_connect: ctx is null"
367 362
 msgstr ""
368 363
 
369
-#: clamav-milter.c:1898
364
+#: clamav-milter.c:1894
370 365
 msgid "clamfi_connect: hostname is null"
371 366
 msgstr ""
372 367
 
373
-#: clamav-milter.c:1919
368
+#: clamav-milter.c:1915
374 369
 msgid "clamfi_connect: remoteIP is null"
375 370
 msgstr ""
376 371
 
377
-#: clamav-milter.c:1927
372
+#: clamav-milter.c:1923
378 373
 #, c-format
379 374
 msgid "clamfi_connect: connection from %s [%s]"
380 375
 msgstr ""
381 376
 
382
-#: clamav-milter.c:1928
377
+#: clamav-milter.c:1924
383 378
 #, c-format
384 379
 msgid "clamfi_connect: connection from %s [%s]\n"
385 380
 msgstr ""
386 381
 
387
-#: clamav-milter.c:1947
382
+#: clamav-milter.c:1943
388 383
 msgid "Can't get sendmail hostname"
389 384
 msgstr ""
390 385
 
391
-#: clamav-milter.c:1952
386
+#: clamav-milter.c:1948
392 387
 #, c-format
393 388
 msgid "Access Denied: Host Unknown (%s)"
394 389
 msgstr ""
395 390
 
396
-#: clamav-milter.c:1962
391
+#: clamav-milter.c:1958
397 392
 #, c-format
398 393
 msgid "Access Denied: Can't get IP address for (%s)"
399 394
 msgstr ""
400 395
 
401
-#: clamav-milter.c:1979
396
+#: clamav-milter.c:1975
402 397
 #, c-format
403 398
 msgid "Access Denied for %s[%s]"
404 399
 msgstr ""
405 400
 
406
-#: clamav-milter.c:1997
401
+#: clamav-milter.c:1993
407 402
 msgid "clamfi_connect: not scanning outgoing messages"
408 403
 msgstr ""
409 404
 
410
-#: clamav-milter.c:1998
405
+#: clamav-milter.c:1994
411 406
 msgid "clamfi_connect: not scanning outgoing messages\n"
412 407
 msgstr ""
413 408
 
414
-#: clamav-milter.c:2006
409
+#: clamav-milter.c:2002
415 410
 msgid "clamfi_connect: not scanning local messages"
416 411
 msgstr ""
417 412
 
418
-#: clamav-milter.c:2007
413
+#: clamav-milter.c:2003
419 414
 msgid "clamfi_connect: not scanning local messages\n"
420 415
 msgstr ""
421 416
 
422
-#: clamav-milter.c:2041
417
+#: clamav-milter.c:2037
423 418
 #, c-format
424 419
 msgid "hit max-children limit (%u >= %u)\n"
425 420
 msgstr ""
426 421
 
427
-#: clamav-milter.c:2042
422
+#: clamav-milter.c:2038
428 423
 #, c-format
429 424
 msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"
430 425
 msgstr ""
431 426
 
432
-#: clamav-milter.c:2048
427
+#: clamav-milter.c:2044
433 428
 #, c-format
434 429
 msgid "hit max-children limit (%u >= %u)"
435 430
 msgstr ""
436 431
 
437
-#: clamav-milter.c:2049
432
+#: clamav-milter.c:2045
438 433
 #, c-format
439 434
 msgid "hit max-children limit (%u >= %u): waiting for some to exit"
440 435
 msgstr ""
441 436
 
442
-#: clamav-milter.c:2054
437
+#: clamav-milter.c:2050
443 438
 msgid "AV system temporarily overloaded - please try later"
444 439
 msgstr ""
445 440
 
446
-#: clamav-milter.c:2084
441
+#: clamav-milter.c:2080
447 442
 #, c-format
448 443
 msgid ">n_children = %d\n"
449 444
 msgstr ""
450 445
 
451
-#: clamav-milter.c:2090
446
+#: clamav-milter.c:2086
452 447
 msgid "Timeout waiting for a child to die"
453 448
 msgstr ""
454 449
 
455
-#: clamav-milter.c:2092
450
+#: clamav-milter.c:2088
456 451
 msgid "Timeout waiting for a child to die\n"
457 452
 msgstr ""
458 453
 
459
-#: clamav-milter.c:2211
454
+#: clamav-milter.c:2208
460 455
 msgid "clamfi_eoh"
461 456
 msgstr ""
462 457
 
463
-#: clamav-milter.c:2214
458
+#: clamav-milter.c:2211
464 459
 msgid "clamfi_eoh\n"
465 460
 msgstr ""
466 461
 
467
-#: clamav-milter.c:2271
462
+#: clamav-milter.c:2268
468 463
 msgid "clamfi_eoh: ignoring whitelisted message"
469 464
 msgstr ""
470 465
 
471
-#: clamav-milter.c:2273
466
+#: clamav-milter.c:2270
472 467
 msgid "clamfi_eoh: not scanning outgoing messages\n"
473 468
 msgstr ""
474 469
 
475
-#: clamav-milter.c:2287
470
+#: clamav-milter.c:2284
476 471
 #, c-format
477 472
 msgid "clamfi_envbody: %u bytes"
478 473
 msgstr ""
479 474
 
480
-#: clamav-milter.c:2289
475
+#: clamav-milter.c:2286
481 476
 #, c-format
482 477
 msgid "clamfi_envbody: %u bytes\n"
483 478
 msgstr ""
484 479
 
485
-#: clamav-milter.c:2299 clamav-milter.c:2490
480
+#: clamav-milter.c:2296 clamav-milter.c:2487
486 481
 #, c-format
487 482
 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"
488 483
 msgstr ""
489 484
 
490
-#: clamav-milter.c:2303 clamav-milter.c:2493
485
+#: clamav-milter.c:2300 clamav-milter.c:2490
491 486
 msgid "Not Scanned - StreamMaxLength exceeded"
492 487
 msgstr ""
493 488
 
494
-#: clamav-milter.c:2375 clamav-milter.c:2393 clamav-milter.c:3378
495
-#: clamav-milter.c:3385
489
+#: clamav-milter.c:2372 clamav-milter.c:2390 clamav-milter.c:3375
490
+#: clamav-milter.c:3382
496 491
 msgid "send failed to clamd"
497 492
 msgstr ""
498 493
 
499
-#: clamav-milter.c:2410
494
+#: clamav-milter.c:2407
500 495
 #, c-format
501 496
 msgid "clamfi_eom: read %s"
502 497
 msgstr ""
503 498
 
504
-#: clamav-milter.c:2411
499
+#: clamav-milter.c:2408
505 500
 #, c-format
506 501
 msgid "clamfi_eom: read %s\n"
507 502
 msgstr ""
508 503
 
509
-#: clamav-milter.c:2419
504
+#: clamav-milter.c:2416
510 505
 msgid "clamfi_eom: read nothing from clamd"
511 506
 msgstr ""
512 507
 
513
-#: clamav-milter.c:2421
508
+#: clamav-milter.c:2418
514 509
 msgid "clamfi_eom: read nothing from clamd\n"
515 510
 msgstr ""
516 511
 
517
-#: clamav-milter.c:2456 clamav-milter.c:2479
512
+#: clamav-milter.c:2453 clamav-milter.c:2476
518 513
 msgid "Error determining host"
519 514
 msgstr ""
520 515
 
521
-#: clamav-milter.c:2498
516
+#: clamav-milter.c:2495
522 517
 msgid "Not Scanned"
523 518
 msgstr ""
524 519
 
525
-#: clamav-milter.c:2509
520
+#: clamav-milter.c:2506
526 521
 msgid "Clean"
527 522
 msgstr ""
528 523
 
529
-#: clamav-milter.c:2513
524
+#: clamav-milter.c:2510
530 525
 #, c-format
531 526
 msgid "%s: clean message from %s"
532 527
 msgstr ""
533 528
 
534
-#: clamav-milter.c:2515
529
+#: clamav-milter.c:2512
535 530
 msgid "an unknown sender"
536 531
 msgstr ""
537 532
 
538
-#: clamav-milter.c:2549
533
+#: clamav-milter.c:2546
539 534
 msgid "Infected"
540 535
 msgstr ""
541 536
 
542
-#: clamav-milter.c:2567
537
+#: clamav-milter.c:2564
543 538
 #, c-format
544 539
 msgid "Intercepted virus from %s to"
545 540
 msgstr ""
546 541
 
547
-#: clamav-milter.c:2661
542
+#: clamav-milter.c:2658
548 543
 msgid ""
549 544
 "Subject: Virus intercepted\n"
550 545
 "\n"
551 546
 msgstr ""
552 547
 
553
-#: clamav-milter.c:2683
548
+#: clamav-milter.c:2680
554 549
 msgid "A message you sent to\n"
555 550
 msgstr ""
556 551
 
557
-#: clamav-milter.c:2690
552
+#: clamav-milter.c:2687
558 553
 #, c-format
559 554
 msgid "The message %1$s sent from %2$s to\n"
560 555
 msgstr ""
561 556
 
562
-#: clamav-milter.c:2693
557
+#: clamav-milter.c:2690
563 558
 #, c-format
564 559
 msgid "A message sent from %s to\n"
565 560
 msgstr ""
566 561
 
567
-#: clamav-milter.c:2698
562
+#: clamav-milter.c:2695
568 563
 #, c-format
569 564
 msgid "contained %s and has not been delivered.\n"
570 565
 msgstr ""
571 566
 
572
-#: clamav-milter.c:2702
567
+#: clamav-milter.c:2699
573 568
 #, c-format
574 569
 msgid ""
575 570
 "\n"
576 571
 "The message in question has been quarantined as %s\n"
577 572
 msgstr ""
578 573
 
579
-#: clamav-milter.c:2705
574
+#: clamav-milter.c:2702
580 575
 #, c-format
581 576
 msgid ""
582 577
 "\n"
... ...
@@ -584,13 +579,13 @@ msgid ""
584 584
 "\n"
585 585
 msgstr ""
586 586
 
587
-#: clamav-milter.c:2708
587
+#: clamav-milter.c:2705
588 588
 msgid ""
589 589
 "For your information, the original message headers were:\n"
590 590
 "\n"
591 591
 msgstr ""
592 592
 
593
-#: clamav-milter.c:2721
593
+#: clamav-milter.c:2718
594 594
 #, c-format
595 595
 msgid ""
596 596
 "\n"
... ...
@@ -598,180 +593,180 @@ msgid ""
598 598
 "%s\t\n"
599 599
 msgstr ""
600 600
 
601
-#: clamav-milter.c:2734
601
+#: clamav-milter.c:2731
602 602
 #, c-format
603 603
 msgid "Quarantined infected mail as %s"
604 604
 msgstr ""
605 605
 
606
-#: clamav-milter.c:2758
606
+#: clamav-milter.c:2755
607 607
 #, c-format
608 608
 msgid "Can't set quarantine user %s"
609 609
 msgstr ""
610 610
 
611
-#: clamav-milter.c:2760
611
+#: clamav-milter.c:2757
612 612
 #, c-format
613 613
 msgid "Can't set quarantine user %s\n"
614 614
 msgstr ""
615 615
 
616
-#: clamav-milter.c:2773
616
+#: clamav-milter.c:2770
617 617
 #, c-format
618 618
 msgid "virus %s detected by ClamAV - http://www.clamav.net"
619 619
 msgstr ""
620 620
 
621
-#: clamav-milter.c:2854
621
+#: clamav-milter.c:2851
622 622
 #, c-format
623 623
 msgid "Can't remove clean file %s"
624 624
 msgstr ""
625 625
 
626
-#: clamav-milter.c:3020 clamav-milter.c:3023
626
+#: clamav-milter.c:3017 clamav-milter.c:3020
627 627
 #, c-format
628 628
 msgid "write failure (%u bytes) to %s: %s"
629 629
 msgstr ""
630 630
 
631
-#: clamav-milter.c:3037 clamav-milter.c:3040
631
+#: clamav-milter.c:3034 clamav-milter.c:3037
632 632
 #, c-format
633 633
 msgid "write failure (%u bytes) to clamd: %s"
634 634
 msgstr ""
635 635
 
636
-#: clamav-milter.c:3106
636
+#: clamav-milter.c:3103
637 637
 #, c-format
638 638
 msgid "No data received from clamd in %d seconds\n"
639 639
 msgstr ""
640 640
 
641
-#: clamav-milter.c:3128
641
+#: clamav-milter.c:3125
642 642
 #, c-format
643 643
 msgid "Can't stat %s"
644 644
 msgstr ""
645 645
 
646
-#: clamav-milter.c:3139 clamav-milter.c:3520
646
+#: clamav-milter.c:3136 clamav-milter.c:3517
647 647
 #, c-format
648 648
 msgid "Can't open %s"
649 649
 msgstr ""
650 650
 
651
-#: clamav-milter.c:3277
651
+#: clamav-milter.c:3274
652 652
 #, c-format
653 653
 msgid "mkdir %s failed"
654 654
 msgstr ""
655 655
 
656
-#: clamav-milter.c:3290
656
+#: clamav-milter.c:3287
657 657
 #, c-format
658 658
 msgid "mktemp %s failed"
659 659
 msgstr ""
660 660
 
661
-#: clamav-milter.c:3300
661
+#: clamav-milter.c:3297
662 662
 #, c-format
663 663
 msgid "Temporary quarantine file %s creation failed"
664 664
 msgstr ""
665 665
 
666
-#: clamav-milter.c:3397
666
+#: clamav-milter.c:3394
667 667
 msgid "failed to create TCPSocket to talk to clamd"
668 668
 msgstr ""
669 669
 
670
-#: clamav-milter.c:3411
670
+#: clamav-milter.c:3408
671 671
 msgid "recv failed from clamd getting PORT"
672 672
 msgstr ""
673 673
 
674
-#: clamav-milter.c:3421
674
+#: clamav-milter.c:3418
675 675
 #, c-format
676 676
 msgid "Expected port information from clamd, got '%s'"
677 677
 msgstr ""
678 678
 
679
-#: clamav-milter.c:3424
679
+#: clamav-milter.c:3421
680 680
 #, c-format
681 681
 msgid "Expected port information from clamd, got '%s'\n"
682 682
 msgstr ""
683 683
 
684
-#: clamav-milter.c:3439
684
+#: clamav-milter.c:3436
685 685
 #, c-format
686 686
 msgid "Connecting to local port %d\n"
687 687
 msgstr ""
688 688
 
689
-#: clamav-milter.c:3450 clamav-milter.c:3453
689
+#: clamav-milter.c:3447 clamav-milter.c:3450
690 690
 #, c-format
691 691
 msgid "Failed to connect to port %d given by clamd: %s"
692 692
 msgstr ""
693 693
 
694
-#: clamav-milter.c:3532
694
+#: clamav-milter.c:3529
695 695
 #, c-format
696 696
 msgid "Clamd (pid %d) seems to have died"
697 697
 msgstr ""
698 698
 
699
-#: clamav-milter.c:3558
699
+#: clamav-milter.c:3555
700 700
 #, c-format
701 701
 msgid "Can't open e-mail template file %s"
702 702
 msgstr ""
703 703
 
704
-#: clamav-milter.c:3567
704
+#: clamav-milter.c:3564
705 705
 #, c-format
706 706
 msgid "Can't stat e-mail template file %s"
707 707
 msgstr ""
708 708
 
709
-#: clamav-milter.c:3576
709
+#: clamav-milter.c:3573
710 710
 msgid "Out of memory"
711 711
 msgstr ""
712 712
 
713
-#: clamav-milter.c:3603
713
+#: clamav-milter.c:3600
714 714
 #, c-format
715 715
 msgid "%s: Unknown clamAV variable \"%c\"\n"
716 716
 msgstr ""
717 717
 
718
-#: clamav-milter.c:3614
718
+#: clamav-milter.c:3611
719 719
 #, c-format
720 720
 msgid "%s: Unterminated sendmail variable \"%s\"\n"
721 721
 msgstr ""
722 722
 
723
-#: clamav-milter.c:3625
723
+#: clamav-milter.c:3622
724 724
 #, c-format
725 725
 msgid "%s: Unknown sendmail variable \"%s\"\n"
726 726
 msgstr ""
727 727
 
728
-#: clamav-milter.c:3691
728
+#: clamav-milter.c:3688
729 729
 #, c-format
730 730
 msgid "Can't rename %1$s to %2$s"
731 731
 msgstr ""
732 732
 
733
-#: clamav-milter.c:3713
733
+#: clamav-milter.c:3711
734 734
 #, c-format
735 735
 msgid "[Virus] %s"
736 736
 msgstr ""
737 737
 
738
-#: clamav-milter.c:3803
738
+#: clamav-milter.c:3801
739 739
 msgid ""
740 740
 "No response from any clamd server - your AV system is not scanning emails\n"
741 741
 msgstr ""
742 742
 
743
-#: clamav-milter.c:3806
743
+#: clamav-milter.c:3804
744 744
 msgid ""
745 745
 "No response from any clamd server - your AV system is not scanning emails"
746 746
 msgstr ""
747 747
 
748
-#: clamav-milter.c:3824
748
+#: clamav-milter.c:3822
749 749
 msgid "Subject: ClamAV Down\n"
750 750
 msgstr ""
751 751
 
752
-#: clamav-milter.c:3827
752
+#: clamav-milter.c:3825
753 753
 msgid ""
754 754
 "This is an automatic message\n"
755 755
 "\n"
756 756
 msgstr ""
757 757
 
758
-#: clamav-milter.c:3830
758
+#: clamav-milter.c:3828
759 759
 msgid "The clamd program cannot be contacted.\n"
760 760
 msgstr ""
761 761
 
762
-#: clamav-milter.c:3832
762
+#: clamav-milter.c:3830
763 763
 msgid "No clamd server can be contacted.\n"
764 764
 msgstr ""
765 765
 
766
-#: clamav-milter.c:3834
766
+#: clamav-milter.c:3832
767 767
 msgid "Emails may not be being scanned, please check your servers.\n"
768 768
 msgstr ""
769 769
 
770
-#: clamav-milter.c:4045 clamav-milter.c:4074
770
+#: clamav-milter.c:4043 clamav-milter.c:4072
771 771
 #, c-format
772 772
 msgid "Stopping %s"
773 773
 msgstr ""
774 774
 
775
-#: clamav-milter.c:4076
775
+#: clamav-milter.c:4074
776 776
 msgid "Stopping clamav-milter"
777 777
 msgstr ""