Browse code

Better SMTP message when virus is found

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

Nigel Horne authored on 2004/10/04 19:53:58
Showing 3 changed files
... ...
@@ -512,6 +512,7 @@ Changes
512 512
 0.80e	30/9/04	If you say --from with no arguments, the from address is now
513 513
 			set to the orginator's address
514 514
 0.80f	2/10/04	Fix crash if %h is used in a template and --headers is not set
515
+0.80g	4/10/04	Enhanced the SMTP reply
515 516
 
516 517
 INTERNATIONALISATION
517 518
 
... ...
@@ -26,6 +26,9 @@
26 26
  *
27 27
  * Change History:
28 28
  * $Log: clamav-milter.c,v $
29
+ * Revision 1.138  2004/10/04 10:53:58  nigelhorne
30
+ * Better SMTP message when virus is found
31
+ *
29 32
  * Revision 1.137  2004/10/02 17:54:06  nigelhorne
30 33
  * Fix crash if %h is used in a template and --headers is not set
31 34
  *
... ...
@@ -422,9 +425,9 @@
422 422
  * Revision 1.6  2003/09/28 16:37:23  nigelhorne
423 423
  * Added -f flag use MaxThreads if --max-children not set
424 424
  */
425
-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.137 2004/10/02 17:54:06 nigelhorne Exp $";
425
+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.138 2004/10/04 10:53:58 nigelhorne Exp $";
426 426
 
427
-#define	CM_VERSION	"0.80f"
427
+#define	CM_VERSION	"0.80g"
428 428
 
429 429
 /*#define	CONFDIR	"/usr/local/etc"*/
430 430
 
... ...
@@ -2770,7 +2773,7 @@ clamfi_eom(SMFICTX *ctx)
2770 2770
 		} else
2771 2771
 			rc = SMFIS_DISCARD;
2772 2772
 
2773
-		snprintf(reject, sizeof(reject) - 1, _("%s detected by ClamAV - http://www.clamav.net"), virusname);
2773
+		snprintf(reject, sizeof(reject) - 1, _("virus %s detected by ClamAV - http://www.clamav.net"), virusname);
2774 2774
 		smfi_setreply(ctx, (char *)privdata->rejectCode, "5.7.1", reject);
2775 2775
 		broadcast(mess);
2776 2776
 	}
... ...
@@ -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-09-28 13:53+0100\n"
11
+"POT-Creation-Date: 2004-10-04 11:43+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,567 @@ msgstr ""
16 16
 "Content-Type: text/plain; charset=CHARSET\n"
17 17
 "Content-Transfer-Encoding: 8bit\n"
18 18
 
19
-#: clamav-milter.c:780
19
+#: clamav-milter.c:789
20 20
 msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them."
21 21
 msgstr ""
22 22
 
23
-#: clamav-milter.c:781
23
+#: clamav-milter.c:790
24 24
 msgid "\t--bounce\t\t-b\tSend a failure message to the sender."
25 25
 msgstr ""
26 26
 
27
-#: clamav-milter.c:782
27
+#: clamav-milter.c:791
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:783
33
+#: clamav-milter.c:792
34 34
 msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE."
35 35
 msgstr ""
36 36
 
37
-#: clamav-milter.c:784
37
+#: clamav-milter.c:793
38 38
 msgid "\t--debug\t\t\t-D\tPrint debug messages."
39 39
 msgstr ""
40 40
 
41
-#: clamav-milter.c:785
41
+#: clamav-milter.c:794
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:786
46
+#: clamav-milter.c:795
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:787
52
+#: clamav-milter.c:796
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:788
56
+#: clamav-milter.c:797
57 57
 msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."
58 58
 msgstr ""
59 59
 
60
-#: clamav-milter.c:789
60
+#: clamav-milter.c:798
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:790
64
+#: clamav-milter.c:799
65 65
 msgid "\t--help\t\t\t-h\tThis message."
66 66
 msgstr ""
67 67
 
68
-#: clamav-milter.c:791
68
+#: clamav-milter.c:800
69 69
 msgid "\t--headers\t\t-H\tInclude original message headers in the report."
70 70
 msgstr ""
71 71
 
72
-#: clamav-milter.c:792
72
+#: clamav-milter.c:801
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:793
76
+#: clamav-milter.c:802
77 77
 msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans."
78 78
 msgstr ""
79 79
 
80
-#: clamav-milter.c:794
80
+#: clamav-milter.c:803
81 81
 msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine."
82 82
 msgstr ""
83 83
 
84
-#: clamav-milter.c:795
84
+#: clamav-milter.c:804
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:796
88
+#: clamav-milter.c:805
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:797
92
+#: clamav-milter.c:806
93 93
 msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."
94 94
 msgstr ""
95 95
 
96
-#: clamav-milter.c:798
96
+#: clamav-milter.c:807
97 97
 msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."
98 98
 msgstr ""
99 99
 
100
-#: clamav-milter.c:799
100
+#: clamav-milter.c:808
101 101
 msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster."
102 102
 msgstr ""
103 103
 
104
-#: clamav-milter.c:800
104
+#: clamav-milter.c:809
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:801
108
+#: clamav-milter.c:810
109 109
 msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account."
110 110
 msgstr ""
111 111
 
112
-#: clamav-milter.c:802
112
+#: clamav-milter.c:811
113 113
 msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."
114 114
 msgstr ""
115 115
 
116
-#: clamav-milter.c:803
116
+#: clamav-milter.c:812
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:804
122
+#: clamav-milter.c:813
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:805
126
+#: clamav-milter.c:814
127 127
 msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file."
128 128
 msgstr ""
129 129
 
130
-#: clamav-milter.c:806
130
+#: clamav-milter.c:815
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:807
134
+#: clamav-milter.c:816
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:808
138
+#: clamav-milter.c:817
139 139
 msgid "\t--version\t\t-V\tPrint the version number of this software."
140 140
 msgstr ""
141 141
 
142
-#: clamav-milter.c:810
142
+#: clamav-milter.c:819
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:812
146
+#: clamav-milter.c:821
147 147
 msgid ""
148 148
 "\n"
149 149
 "For more information type \"man clamav-milter\"."
150 150
 msgstr ""
151 151
 
152
-#: clamav-milter.c:813
152
+#: clamav-milter.c:822
153 153
 msgid "Report bugs to bugs@clamav.net."
154 154
 msgstr ""
155 155
 
156
-#: clamav-milter.c:1089
156
+#: clamav-milter.c:1103
157 157
 #, c-format
158 158
 msgid "%s: No socket-addr given\n"
159 159
 msgstr ""
160 160
 
161
-#: clamav-milter.c:1098
161
+#: clamav-milter.c:1112
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:1138
166
+#: clamav-milter.c:1152
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:1142
173
+#: clamav-milter.c:1156
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:1153
178
+#: clamav-milter.c:1167
179 179
 #, c-format
180 180
 msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n"
181 181
 msgstr ""
182 182
 
183
-#: clamav-milter.c:1170
183
+#: clamav-milter.c:1184
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:1173
188
+#: clamav-milter.c:1187
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:1175
193
+#: clamav-milter.c:1189
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:1180
198
+#: clamav-milter.c:1194
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:1187
203
+#: clamav-milter.c:1201
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:1203
208
+#: clamav-milter.c:1217
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:1222
213
+#: clamav-milter.c:1236
214 214
 #, c-format
215 215
 msgid "%s: ScanMail not enabled in %s\n"
216 216
 msgstr ""
217 217
 
218
-#: clamav-milter.c:1239
218
+#: clamav-milter.c:1253
219 219
 #, c-format
220 220
 msgid "%s: ReadTimeout must not be negative in %s\n"
221 221
 msgstr ""
222 222
 
223
-#: clamav-milter.c:1246
223
+#: clamav-milter.c:1260
224 224
 #, c-format
225 225
 msgid "%s: StreamMaxLength must not be negative in %s\n"
226 226
 msgstr ""
227 227
 
228
-#: clamav-milter.c:1261
228
+#: clamav-milter.c:1275
229 229
 #, c-format
230 230
 msgid "%s: You can select one server type only (local/TCP) in %s\n"
231 231
 msgstr ""
232 232
 
233
-#: clamav-milter.c:1271 clamav-milter.c:1294
233
+#: clamav-milter.c:1285 clamav-milter.c:1308
234 234
 #, c-format
235 235
 msgid "Can't talk to clamd server via %s\n"
236 236
 msgstr ""
237 237
 
238
-#: clamav-milter.c:1273 clamav-milter.c:1296
238
+#: clamav-milter.c:1287 clamav-milter.c:1310
239 239
 #, c-format
240 240
 msgid "Check your entry for LocalSocket in %s\n"
241 241
 msgstr ""
242 242
 
243
-#: clamav-milter.c:1307
243
+#: clamav-milter.c:1321
244 244
 msgid "Can't create a clamd session"
245 245
 msgstr ""
246 246
 
247
-#: clamav-milter.c:1319
247
+#: clamav-milter.c:1333
248 248
 #, c-format
249 249
 msgid ""
250 250
 "%s: --quarantine-dir not supported for remote scanning - use --quarantine\n"
251 251
 msgstr ""
252 252
 
253
-#: clamav-milter.c:1346
253
+#: clamav-milter.c:1360
254 254
 #, c-format
255 255
 msgid "%s: Sessions does not multiplex\n"
256 256
 msgstr ""
257 257
 
258
-#: clamav-milter.c:1362
258
+#: clamav-milter.c:1376
259 259
 #, c-format
260 260
 msgid "%s: Unknown host %s\n"
261 261
 msgstr ""
262 262
 
263
-#: clamav-milter.c:1374
263
+#: clamav-milter.c:1388
264 264
 #, c-format
265 265
 msgid "Can't talk to clamd server %s on port %d\n"
266 266
 msgstr ""
267 267
 
268
-#: clamav-milter.c:1389
268
+#: clamav-milter.c:1403
269 269
 msgid "Can't find any clamd servers\n"
270 270
 msgstr ""
271 271
 
272
-#: clamav-milter.c:1390
272
+#: clamav-milter.c:1404
273 273
 #, c-format
274 274
 msgid "Check your entry for TCPSocket in %s\n"
275 275
 msgstr ""
276 276
 
277
-#: clamav-milter.c:1396
277
+#: clamav-milter.c:1410
278 278
 #, c-format
279 279
 msgid "%s: You must select server type (local/TCP) in %s\n"
280 280
 msgstr ""
281 281
 
282
-#: clamav-milter.c:1403
282
+#: clamav-milter.c:1417
283 283
 #, c-format
284 284
 msgid "When debugging it is recommended that you use Foreground mode in %s\n"
285 285
 msgstr ""
286 286
 
287
-#: clamav-milter.c:1404
287
+#: clamav-milter.c:1418
288 288
 msgid "So that you can see all of the messages"
289 289
 msgstr ""
290 290
 
291
-#: clamav-milter.c:1465
291
+#: clamav-milter.c:1479
292 292
 #, c-format
293 293
 msgid "Starting: %s"
294 294
 msgstr ""
295 295
 
296
-#: clamav-milter.c:1470
296
+#: clamav-milter.c:1484
297 297
 msgid "Debugging is on"
298 298
 msgstr ""
299 299
 
300
-#: clamav-milter.c:1474
300
+#: clamav-milter.c:1488
301 301
 #, c-format
302 302
 msgid ""
303 303
 "%s: (-q && !LogSyslog): warning - all interception message methods are off\n"
304 304
 msgstr ""
305 305
 
306
-#: clamav-milter.c:1478
306
+#: clamav-milter.c:1492
307 307
 msgid "Starting clamav-milter"
308 308
 msgstr ""
309 309
 
310
-#: clamav-milter.c:1487
310
+#: clamav-milter.c:1501
311 311
 #, c-format
312 312
 msgid "Can't save PID in file %s"
313 313
 msgstr ""
314 314
 
315
-#: clamav-milter.c:1489
315
+#: clamav-milter.c:1503
316 316
 #, c-format
317 317
 msgid "Can't save PID in file %s\n"
318 318
 msgstr ""
319 319
 
320
-#: clamav-milter.c:1517
320
+#: clamav-milter.c:1531
321 321
 #, c-format
322 322
 msgid "%s: smfi_setconn failed\n"
323 323
 msgstr ""
324 324
 
325
-#: clamav-milter.c:1530
325
+#: clamav-milter.c:1544
326 326
 #, c-format
327 327
 msgid "Started: %s"
328 328
 msgstr ""
329 329
 
330
-#: clamav-milter.c:1567 clamav-milter.c:1799
330
+#: clamav-milter.c:1581 clamav-milter.c:1813
331 331
 #, c-format
332 332
 msgid "Check clamd server %s - it may be down\n"
333 333
 msgstr ""
334 334
 
335
-#: clamav-milter.c:1570 clamav-milter.c:1806
335
+#: clamav-milter.c:1584 clamav-milter.c:1820
336 336
 msgid "Check clamd server - it may be down\n"
337 337
 msgstr ""
338 338
 
339
-#: clamav-milter.c:1731
339
+#: clamav-milter.c:1745
340 340
 msgid "No free clamd sessions\n"
341 341
 msgstr ""
342 342
 
343
-#: clamav-milter.c:1802
343
+#: clamav-milter.c:1816
344 344
 #, c-format
345 345
 msgid "Check clamd server %s - it may be down"
346 346
 msgstr ""
347 347
 
348
-#: clamav-milter.c:1842
348
+#: clamav-milter.c:1856
349 349
 msgid "findServer: select failed"
350 350
 msgstr ""
351 351
 
352
-#: clamav-milter.c:1851
352
+#: clamav-milter.c:1865
353 353
 #, c-format
354 354
 msgid "findServer: using server %d\n"
355 355
 msgstr ""
356 356
 
357
-#: clamav-milter.c:1856
357
+#: clamav-milter.c:1870
358 358
 msgid "findServer: No response from any server\n"
359 359
 msgstr ""
360 360
 
361
-#: clamav-milter.c:1858
361
+#: clamav-milter.c:1872
362 362
 msgid "findServer: No response from any server"
363 363
 msgstr ""
364 364
 
365
-#: clamav-milter.c:1879
365
+#: clamav-milter.c:1893
366 366
 msgid "clamfi_connect: ctx is null"
367 367
 msgstr ""
368 368
 
369
-#: clamav-milter.c:1884
369
+#: clamav-milter.c:1898
370 370
 msgid "clamfi_connect: hostname is null"
371 371
 msgstr ""
372 372
 
373
-#: clamav-milter.c:1905
373
+#: clamav-milter.c:1919
374 374
 msgid "clamfi_connect: remoteIP is null"
375 375
 msgstr ""
376 376
 
377
-#: clamav-milter.c:1913
377
+#: clamav-milter.c:1927
378 378
 #, c-format
379 379
 msgid "clamfi_connect: connection from %s [%s]"
380 380
 msgstr ""
381 381
 
382
-#: clamav-milter.c:1914
382
+#: clamav-milter.c:1928
383 383
 #, c-format
384 384
 msgid "clamfi_connect: connection from %s [%s]\n"
385 385
 msgstr ""
386 386
 
387
-#: clamav-milter.c:1933
387
+#: clamav-milter.c:1947
388 388
 msgid "Can't get sendmail hostname"
389 389
 msgstr ""
390 390
 
391
-#: clamav-milter.c:1938
391
+#: clamav-milter.c:1952
392 392
 #, c-format
393 393
 msgid "Access Denied: Host Unknown (%s)"
394 394
 msgstr ""
395 395
 
396
-#: clamav-milter.c:1948
396
+#: clamav-milter.c:1962
397 397
 #, c-format
398 398
 msgid "Access Denied: Can't get IP address for (%s)"
399 399
 msgstr ""
400 400
 
401
-#: clamav-milter.c:1965
401
+#: clamav-milter.c:1979
402 402
 #, c-format
403 403
 msgid "Access Denied for %s[%s]"
404 404
 msgstr ""
405 405
 
406
-#: clamav-milter.c:1983
406
+#: clamav-milter.c:1997
407 407
 msgid "clamfi_connect: not scanning outgoing messages"
408 408
 msgstr ""
409 409
 
410
-#: clamav-milter.c:1984
410
+#: clamav-milter.c:1998
411 411
 msgid "clamfi_connect: not scanning outgoing messages\n"
412 412
 msgstr ""
413 413
 
414
-#: clamav-milter.c:1992
414
+#: clamav-milter.c:2006
415 415
 msgid "clamfi_connect: not scanning local messages"
416 416
 msgstr ""
417 417
 
418
-#: clamav-milter.c:1993
418
+#: clamav-milter.c:2007
419 419
 msgid "clamfi_connect: not scanning local messages\n"
420 420
 msgstr ""
421 421
 
422
-#: clamav-milter.c:2027
422
+#: clamav-milter.c:2041
423 423
 #, c-format
424 424
 msgid "hit max-children limit (%u >= %u)\n"
425 425
 msgstr ""
426 426
 
427
-#: clamav-milter.c:2028
427
+#: clamav-milter.c:2042
428 428
 #, c-format
429 429
 msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"
430 430
 msgstr ""
431 431
 
432
-#: clamav-milter.c:2034
432
+#: clamav-milter.c:2048
433 433
 #, c-format
434 434
 msgid "hit max-children limit (%u >= %u)"
435 435
 msgstr ""
436 436
 
437
-#: clamav-milter.c:2035
437
+#: clamav-milter.c:2049
438 438
 #, c-format
439 439
 msgid "hit max-children limit (%u >= %u): waiting for some to exit"
440 440
 msgstr ""
441 441
 
442
-#: clamav-milter.c:2040
442
+#: clamav-milter.c:2054
443 443
 msgid "AV system temporarily overloaded - please try later"
444 444
 msgstr ""
445 445
 
446
-#: clamav-milter.c:2070
446
+#: clamav-milter.c:2084
447 447
 #, c-format
448 448
 msgid ">n_children = %d\n"
449 449
 msgstr ""
450 450
 
451
-#: clamav-milter.c:2076
451
+#: clamav-milter.c:2090
452 452
 msgid "Timeout waiting for a child to die"
453 453
 msgstr ""
454 454
 
455
-#: clamav-milter.c:2078
455
+#: clamav-milter.c:2092
456 456
 msgid "Timeout waiting for a child to die\n"
457 457
 msgstr ""
458 458
 
459
-#: clamav-milter.c:2197
459
+#: clamav-milter.c:2211
460 460
 msgid "clamfi_eoh"
461 461
 msgstr ""
462 462
 
463
-#: clamav-milter.c:2200
463
+#: clamav-milter.c:2214
464 464
 msgid "clamfi_eoh\n"
465 465
 msgstr ""
466 466
 
467
-#: clamav-milter.c:2257
467
+#: clamav-milter.c:2271
468 468
 msgid "clamfi_eoh: ignoring whitelisted message"
469 469
 msgstr ""
470 470
 
471
-#: clamav-milter.c:2259
471
+#: clamav-milter.c:2273
472 472
 msgid "clamfi_eoh: not scanning outgoing messages\n"
473 473
 msgstr ""
474 474
 
475
-#: clamav-milter.c:2273
475
+#: clamav-milter.c:2287
476 476
 #, c-format
477 477
 msgid "clamfi_envbody: %u bytes"
478 478
 msgstr ""
479 479
 
480
-#: clamav-milter.c:2275
480
+#: clamav-milter.c:2289
481 481
 #, c-format
482 482
 msgid "clamfi_envbody: %u bytes\n"
483 483
 msgstr ""
484 484
 
485
-#: clamav-milter.c:2285 clamav-milter.c:2476
485
+#: clamav-milter.c:2299 clamav-milter.c:2490
486 486
 #, c-format
487 487
 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"
488 488
 msgstr ""
489 489
 
490
-#: clamav-milter.c:2289 clamav-milter.c:2479
490
+#: clamav-milter.c:2303 clamav-milter.c:2493
491 491
 msgid "Not Scanned - StreamMaxLength exceeded"
492 492
 msgstr ""
493 493
 
494
-#: clamav-milter.c:2361 clamav-milter.c:2379 clamav-milter.c:3358
495
-#: clamav-milter.c:3365
494
+#: clamav-milter.c:2375 clamav-milter.c:2393 clamav-milter.c:3378
495
+#: clamav-milter.c:3385
496 496
 msgid "send failed to clamd"
497 497
 msgstr ""
498 498
 
499
-#: clamav-milter.c:2396
499
+#: clamav-milter.c:2410
500 500
 #, c-format
501 501
 msgid "clamfi_eom: read %s"
502 502
 msgstr ""
503 503
 
504
-#: clamav-milter.c:2397
504
+#: clamav-milter.c:2411
505 505
 #, c-format
506 506
 msgid "clamfi_eom: read %s\n"
507 507
 msgstr ""
508 508
 
509
-#: clamav-milter.c:2405
509
+#: clamav-milter.c:2419
510 510
 msgid "clamfi_eom: read nothing from clamd"
511 511
 msgstr ""
512 512
 
513
-#: clamav-milter.c:2407
513
+#: clamav-milter.c:2421
514 514
 msgid "clamfi_eom: read nothing from clamd\n"
515 515
 msgstr ""
516 516
 
517
-#: clamav-milter.c:2442 clamav-milter.c:2465
517
+#: clamav-milter.c:2456 clamav-milter.c:2479
518 518
 msgid "Error determining host"
519 519
 msgstr ""
520 520
 
521
-#: clamav-milter.c:2484
521
+#: clamav-milter.c:2498
522 522
 msgid "Not Scanned"
523 523
 msgstr ""
524 524
 
525
-#: clamav-milter.c:2495
525
+#: clamav-milter.c:2509
526 526
 msgid "Clean"
527 527
 msgstr ""
528 528
 
529
-#: clamav-milter.c:2499
529
+#: clamav-milter.c:2513
530 530
 #, c-format
531 531
 msgid "%s: clean message from %s"
532 532
 msgstr ""
533 533
 
534
-#: clamav-milter.c:2501
534
+#: clamav-milter.c:2515
535 535
 msgid "an unknown sender"
536 536
 msgstr ""
537 537
 
538
-#: clamav-milter.c:2535
538
+#: clamav-milter.c:2549
539 539
 msgid "Infected"
540 540
 msgstr ""
541 541
 
542
-#: clamav-milter.c:2553
542
+#: clamav-milter.c:2567
543 543
 #, c-format
544 544
 msgid "Intercepted virus from %s to"
545 545
 msgstr ""
546 546
 
547
-#: clamav-milter.c:2644
547
+#: clamav-milter.c:2661
548 548
 msgid ""
549 549
 "Subject: Virus intercepted\n"
550 550
 "\n"
551 551
 msgstr ""
552 552
 
553
-#: clamav-milter.c:2666
553
+#: clamav-milter.c:2683
554 554
 msgid "A message you sent to\n"
555 555
 msgstr ""
556 556
 
557
-#: clamav-milter.c:2673
557
+#: clamav-milter.c:2690
558 558
 #, c-format
559 559
 msgid "The message %1$s sent from %2$s to\n"
560 560
 msgstr ""
561 561
 
562
-#: clamav-milter.c:2676
562
+#: clamav-milter.c:2693
563 563
 #, c-format
564 564
 msgid "A message sent from %s to\n"
565 565
 msgstr ""
566 566
 
567
-#: clamav-milter.c:2681
567
+#: clamav-milter.c:2698
568 568
 #, c-format
569 569
 msgid "contained %s and has not been delivered.\n"
570 570
 msgstr ""
571 571
 
572
-#: clamav-milter.c:2685
572
+#: clamav-milter.c:2702
573 573
 #, c-format
574 574
 msgid ""
575 575
 "\n"
576 576
 "The message in question has been quarantined as %s\n"
577 577
 msgstr ""
578 578
 
579
-#: clamav-milter.c:2688
579
+#: clamav-milter.c:2705
580 580
 #, c-format
581 581
 msgid ""
582 582
 "\n"
... ...
@@ -584,13 +584,13 @@ msgid ""
584 584
 "\n"
585 585
 msgstr ""
586 586
 
587
-#: clamav-milter.c:2691
587
+#: clamav-milter.c:2708
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:2704
593
+#: clamav-milter.c:2721
594 594
 #, c-format
595 595
 msgid ""
596 596
 "\n"
... ...
@@ -598,180 +598,180 @@ msgid ""
598 598
 "%s\t\n"
599 599
 msgstr ""
600 600
 
601
-#: clamav-milter.c:2717
601
+#: clamav-milter.c:2734
602 602
 #, c-format
603 603
 msgid "Quarantined infected mail as %s"
604 604
 msgstr ""
605 605
 
606
-#: clamav-milter.c:2741
606
+#: clamav-milter.c:2758
607 607
 #, c-format
608 608
 msgid "Can't set quarantine user %s"
609 609
 msgstr ""
610 610
 
611
-#: clamav-milter.c:2743
611
+#: clamav-milter.c:2760
612 612
 #, c-format
613 613
 msgid "Can't set quarantine user %s\n"
614 614
 msgstr ""
615 615
 
616
-#: clamav-milter.c:2756
616
+#: clamav-milter.c:2773
617 617
 #, c-format
618
-msgid "%s detected by ClamAV - http://www.clamav.net"
618
+msgid "virus %s detected by ClamAV - http://www.clamav.net"
619 619
 msgstr ""
620 620
 
621
-#: clamav-milter.c:2837
621
+#: clamav-milter.c:2854
622 622
 #, c-format
623 623
 msgid "Can't remove clean file %s"
624 624
 msgstr ""
625 625
 
626
-#: clamav-milter.c:3003 clamav-milter.c:3006
626
+#: clamav-milter.c:3020 clamav-milter.c:3023
627 627
 #, c-format
628 628
 msgid "write failure (%u bytes) to %s: %s"
629 629
 msgstr ""
630 630
 
631
-#: clamav-milter.c:3020 clamav-milter.c:3023
631
+#: clamav-milter.c:3037 clamav-milter.c:3040
632 632
 #, c-format
633 633
 msgid "write failure (%u bytes) to clamd: %s"
634 634
 msgstr ""
635 635
 
636
-#: clamav-milter.c:3089
636
+#: clamav-milter.c:3106
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:3111
641
+#: clamav-milter.c:3128
642 642
 #, c-format
643 643
 msgid "Can't stat %s"
644 644
 msgstr ""
645 645
 
646
-#: clamav-milter.c:3122 clamav-milter.c:3500
646
+#: clamav-milter.c:3139 clamav-milter.c:3520
647 647
 #, c-format
648 648
 msgid "Can't open %s"
649 649
 msgstr ""
650 650
 
651
-#: clamav-milter.c:3257
651
+#: clamav-milter.c:3277
652 652
 #, c-format
653 653
 msgid "mkdir %s failed"
654 654
 msgstr ""
655 655
 
656
-#: clamav-milter.c:3270
656
+#: clamav-milter.c:3290
657 657
 #, c-format
658 658
 msgid "mktemp %s failed"
659 659
 msgstr ""
660 660
 
661
-#: clamav-milter.c:3280
661
+#: clamav-milter.c:3300
662 662
 #, c-format
663 663
 msgid "Temporary quarantine file %s creation failed"
664 664
 msgstr ""
665 665
 
666
-#: clamav-milter.c:3377
666
+#: clamav-milter.c:3397
667 667
 msgid "failed to create TCPSocket to talk to clamd"
668 668
 msgstr ""
669 669
 
670
-#: clamav-milter.c:3391
670
+#: clamav-milter.c:3411
671 671
 msgid "recv failed from clamd getting PORT"
672 672
 msgstr ""
673 673
 
674
-#: clamav-milter.c:3401
674
+#: clamav-milter.c:3421
675 675
 #, c-format
676 676
 msgid "Expected port information from clamd, got '%s'"
677 677
 msgstr ""
678 678
 
679
-#: clamav-milter.c:3404
679
+#: clamav-milter.c:3424
680 680
 #, c-format
681 681
 msgid "Expected port information from clamd, got '%s'\n"
682 682
 msgstr ""
683 683
 
684
-#: clamav-milter.c:3419
684
+#: clamav-milter.c:3439
685 685
 #, c-format
686 686
 msgid "Connecting to local port %d\n"
687 687
 msgstr ""
688 688
 
689
-#: clamav-milter.c:3430 clamav-milter.c:3433
689
+#: clamav-milter.c:3450 clamav-milter.c:3453
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:3512
694
+#: clamav-milter.c:3532
695 695
 #, c-format
696 696
 msgid "Clamd (pid %d) seems to have died"
697 697
 msgstr ""
698 698
 
699
-#: clamav-milter.c:3538
699
+#: clamav-milter.c:3558
700 700
 #, c-format
701 701
 msgid "Can't open e-mail template file %s"
702 702
 msgstr ""
703 703
 
704
-#: clamav-milter.c:3547
704
+#: clamav-milter.c:3567
705 705
 #, c-format
706 706
 msgid "Can't stat e-mail template file %s"
707 707
 msgstr ""
708 708
 
709
-#: clamav-milter.c:3556
709
+#: clamav-milter.c:3576
710 710
 msgid "Out of memory"
711 711
 msgstr ""
712 712
 
713
-#: clamav-milter.c:3583
713
+#: clamav-milter.c:3603
714 714
 #, c-format
715 715
 msgid "%s: Unknown clamAV variable \"%c\"\n"
716 716
 msgstr ""
717 717
 
718
-#: clamav-milter.c:3594
718
+#: clamav-milter.c:3614
719 719
 #, c-format
720 720
 msgid "%s: Unterminated sendmail variable \"%s\"\n"
721 721
 msgstr ""
722 722
 
723
-#: clamav-milter.c:3605
723
+#: clamav-milter.c:3625
724 724
 #, c-format
725 725
 msgid "%s: Unknown sendmail variable \"%s\"\n"
726 726
 msgstr ""
727 727
 
728
-#: clamav-milter.c:3671
728
+#: clamav-milter.c:3691
729 729
 #, c-format
730 730
 msgid "Can't rename %1$s to %2$s"
731 731
 msgstr ""
732 732
 
733
-#: clamav-milter.c:3693
733
+#: clamav-milter.c:3713
734 734
 #, c-format
735 735
 msgid "[Virus] %s"
736 736
 msgstr ""
737 737
 
738
-#: clamav-milter.c:3783
738
+#: clamav-milter.c:3803
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:3786
743
+#: clamav-milter.c:3806
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:3804
748
+#: clamav-milter.c:3824
749 749
 msgid "Subject: ClamAV Down\n"
750 750
 msgstr ""
751 751
 
752
-#: clamav-milter.c:3807
752
+#: clamav-milter.c:3827
753 753
 msgid ""
754 754
 "This is an automatic message\n"
755 755
 "\n"
756 756
 msgstr ""
757 757
 
758
-#: clamav-milter.c:3810
758
+#: clamav-milter.c:3830
759 759
 msgid "The clamd program cannot be contacted.\n"
760 760
 msgstr ""
761 761
 
762
-#: clamav-milter.c:3812
762
+#: clamav-milter.c:3832
763 763
 msgid "No clamd server can be contacted.\n"
764 764
 msgstr ""
765 765
 
766
-#: clamav-milter.c:3814
766
+#: clamav-milter.c:3834
767 767
 msgid "Emails may not be being scanned, please check your servers.\n"
768 768
 msgstr ""
769 769
 
770
-#: clamav-milter.c:4025 clamav-milter.c:4054
770
+#: clamav-milter.c:4045 clamav-milter.c:4074
771 771
 #, c-format
772 772
 msgid "Stopping %s"
773 773
 msgstr ""
774 774
 
775
-#: clamav-milter.c:4056
775
+#: clamav-milter.c:4076
776 776
 msgid "Stopping clamav-milter"
777 777
 msgstr ""