1. clamav-devel
  2. Commit f4ab6fc61e3134fe97e3951765d74af8163ff990
Browse code

Handle dont-scan-on-error if the database can't be loaded when running in internal mode

git-svn: trunk@2162

Nigel Horne authored on 2006/08/01 16:34:19
Showing 3 changed files
clamav-devel/ChangeLog
History View file @ f4ab6fc
... ... 
@@ -1,3 +1,8 @@
1 
+Tue Aug  1 08:33:09 BST 2006 (njh)
2 
+----------------------------------
3 
+  * clamav-milter:	Honour dont-scan-on-error if the database can't be
4 
+				loaded when running in internal mode
5 
+
1 6 
 Mon Jul 31 18:24:36 CEST 2006 (acab)
2 7 
 ------------------------------------
3 8 
   * libclamav: better error handling in pespin
clamav-devel/clamav-milter/clamav-milter.c
History View file @ f4ab6fc
... ... 
@@ -23,9 +23,9 @@
23 23 
  *
24 24 
  * For installation instructions see the file INSTALL that came with this file
25 25 
  */
26 
-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.271 2006/07/25 07:29:39 njh Exp $";
26 
+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.272 2006/08/01 07:32:41 njh Exp $";
27 27
28 
-#define	CM_VERSION	"devel-250706"
28 
+#define	CM_VERSION	"devel-010806"
29 29
30 30 
 #if HAVE_CONFIG_H
31 31 
 #include "clamav-config.h"
... ... 
@@ -1249,8 +1249,18 @@ main(int argc, char **argv)
1249 1249 
 			return EX_CONFIG;
1250 1250 
 		}
1251 1251 
 #endif
1252 
-		if(loadDatabase() != 0)
1253 
-			return EX_CONFIG;
1252 
+		if(loadDatabase() != 0) {
1253 
+			/*
1254 
+			 * Handle the dont-scan-on-error option, which says
1255 
+			 * that we pass on emails, unscanned, if an error has
1256 
+			 * occurred
1257 
+			 */
1258 
+			if(cl_error != SMFIS_ACCEPT)
1259 
+				return EX_CONFIG;
1260 
+
1261 
+			fprintf(stderr, _("%s: No emails will be scanned"),
1262 
+				argv[0]);
1263 
+		}
1254 1264 
 		numServers = 1;
1255 1265 
 	} else if(((cpt = cfgopt(copt, "LocalSocket")) != NULL) && cpt->enabled) {
1256 1266 
 #ifdef	SESSION
clamav-devel/clamav-milter/clamav-milter.po
History View file @ f4ab6fc
... ... 
@@ -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: 2006-07-19 13:54+0100\n"
11 
+"POT-Creation-Date: 2006-08-01 08:32+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,802 +16,806 @@ msgstr ""
16 16 
 "Content-Type: text/plain; charset=CHARSET\n"
17 17 
 "Content-Transfer-Encoding: 8bit\n"
18 18
19 
-#: clamav-milter.c:531
19 
+#: clamav-milter.c:534
20 20 
 msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them."
21 21 
 msgstr ""
22 22
23 
-#: clamav-milter.c:532
23 
+#: clamav-milter.c:535
24 24 
 msgid "\t--blacklist=time\t-k\tTime (in seconds) to blacklist an IP."
25 25 
 msgstr ""
26 26
27 
-#: clamav-milter.c:533
27 
+#: clamav-milter.c:536
28 28 
 msgid "\t--black-hole-mode\t\tDon't scan messages aliased to /dev/null."
29 29 
 msgstr ""
30 30
31 
-#: clamav-milter.c:534
31 
+#: clamav-milter.c:537
32 32 
 msgid "\t--bounce\t\t-b\tSend a failure message to the sender."
33 33 
 msgstr ""
34 34
35 
-#: clamav-milter.c:535
35 
+#: clamav-milter.c:538
36 36 
 msgid ""
37 37 
 "\t--broadcast\t\t-B [IFACE]\tBroadcast to a network manager when a virus is "
38 38 
 "found."
39 39 
 msgstr ""
40 40
41 
-#: clamav-milter.c:536
41 
+#: clamav-milter.c:539
42 42 
 msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE."
43 43 
 msgstr ""
44 44
45 
-#: clamav-milter.c:537
45 
+#: clamav-milter.c:540
46 46 
 msgid "\t--debug\t\t\t-D\tPrint debug messages."
47 47 
 msgstr ""
48 48
49 
-#: clamav-milter.c:538
49 
+#: clamav-milter.c:541
50 50 
 msgid ""
51 51 
 "\t--detect-forged-local-address\t-L\tReject mails that claim to be from us."
52 52 
 msgstr ""
53 53
54 
-#: clamav-milter.c:539
54 
+#: clamav-milter.c:542
55 55 
 msgid ""
56 56 
 "\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error "
57 57 
 "occurs."
58 58 
 msgstr ""
59 59
60 
-#: clamav-milter.c:540
60 
+#: clamav-milter.c:543
61 61 
 msgid "\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded."
62 62 
 msgstr ""
63 63
64 
-#: clamav-milter.c:541
64 
+#: clamav-milter.c:544
65 65 
 msgid "\t--external\t\t-e\tUse an external scanner (usually clamd)."
66 66 
 msgstr ""
67 67
68 
-#: clamav-milter.c:542
68 
+#: clamav-milter.c:545
69 69 
 msgid ""
70 70 
 "\t--freshclam-monitor=SECS\t-M SECS\tHow often to check for database update."
71 71 
 msgstr ""
72 72
73 
-#: clamav-milter.c:543
73 
+#: clamav-milter.c:546
74 74 
 msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."
75 75 
 msgstr ""
76 76
77 
-#: clamav-milter.c:544
77 
+#: clamav-milter.c:547
78 78 
 msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)."
79 79 
 msgstr ""
80 80
81 
-#: clamav-milter.c:545
81 
+#: clamav-milter.c:548
82 82 
 msgid "\t--help\t\t\t-h\tThis message."
83 83 
 msgstr ""
84 84
85 
-#: clamav-milter.c:546
85 
+#: clamav-milter.c:549
86 86 
 msgid "\t--headers\t\t-H\tInclude original message headers in the report."
87 87 
 msgstr ""
88 88
89 
-#: clamav-milter.c:547
89 
+#: clamav-milter.c:550
90 90 
 msgid ""
91 91 
 "\t--ignore IPaddr\t\t-I IPaddr\tAdd IPaddr to LAN IP list (see --local)."
92 92 
 msgstr ""
93 93
94 
-#: clamav-milter.c:548
94 
+#: clamav-milter.c:551
95 95 
 msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN."
96 96 
 msgstr ""
97 97
98 
-#: clamav-milter.c:549
98 
+#: clamav-milter.c:552
99 99 
 msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans."
100 100 
 msgstr ""
101 101
102 
-#: clamav-milter.c:550
102 
+#: clamav-milter.c:553
103 103 
 msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine."
104 104 
 msgstr ""
105 105
106 
-#: clamav-milter.c:551
106 
+#: clamav-milter.c:554
107 107 
 msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."
108 108 
 msgstr ""
109 109
110 
-#: clamav-milter.c:552
110 
+#: clamav-milter.c:555
111 111 
 msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."
112 112 
 msgstr ""
113 113
114 
-#: clamav-milter.c:553
114 
+#: clamav-milter.c:556
115 115 
 msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."
116 116 
 msgstr ""
117 117
118 
-#: clamav-milter.c:554
118 
+#: clamav-milter.c:557
119 119 
 msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."
120 120 
 msgstr ""
121 121
122 
-#: clamav-milter.c:555
122 
+#: clamav-milter.c:558
123 123 
 msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster."
124 124 
 msgstr ""
125 125
126 
-#: clamav-milter.c:556
126 
+#: clamav-milter.c:559
127 127 
 msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."
128 128 
 msgstr ""
129 129
130 
-#: clamav-milter.c:557
131 
-msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account."
130 
+#: clamav-milter.c:560
131 
+msgid "\t--quarantine=USER\t-Q EMAIL\tQuarantine e-mail account."
132 132 
 msgstr ""
133 133
134 
-#: clamav-milter.c:558
134 
+#: clamav-milter.c:561
135 
+msgid "\t--report-phish=EMAIL\t-r EMAIL\tReport phish to this email address."
136 
+msgstr ""
137 
+
138 
+#: clamav-milter.c:562
135 139 
 msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."
136 140 
 msgstr ""
137 141
138 
-#: clamav-milter.c:559
142 
+#: clamav-milter.c:563
139 143 
 msgid ""
140 144 
 "\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running "
141 145 
 "clamd (when using TCPsocket)."
142 146 
 msgstr ""
143 147
144 
-#: clamav-milter.c:560
148 
+#: clamav-milter.c:564
145 149 
 msgid "\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify"
146 150 
 msgstr ""
147 151
148 
-#: clamav-milter.c:561
152 
+#: clamav-milter.c:565
149 153 
 msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."
150 154 
 msgstr ""
151 155
152 
-#: clamav-milter.c:562
156 
+#: clamav-milter.c:566
153 157 
 msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file."
154 158 
 msgstr ""
155 159
156 
-#: clamav-milter.c:563
160 
+#: clamav-milter.c:567
157 161 
 msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."
158 162 
 msgstr ""
159 163
160 
-#: clamav-milter.c:564
164 
+#: clamav-milter.c:568
161 165 
 msgid ""
162 166 
 "\t--template-headers=FILE\t\tLocation of e-mail headers for template file."
163 167 
 msgstr ""
164 168
165 
-#: clamav-milter.c:565
169 
+#: clamav-milter.c:569
166 170 
 msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die."
167 171 
 msgstr ""
168 172
169 
-#: clamav-milter.c:566
173 
+#: clamav-milter.c:570
170 174 
 msgid ""
171 175 
 "\t--whitelist-file=FILE\t-W FILE\tLocation of the file of whitelisted "
172 176 
 "addresses"
173 177 
 msgstr ""
174 178
175 
-#: clamav-milter.c:567
179 
+#: clamav-milter.c:571
176 180 
 msgid "\t--version\t\t-V\tPrint the version number of this software."
177 181 
 msgstr ""
178 182
179 
-#: clamav-milter.c:569
183 
+#: clamav-milter.c:573
180 184 
 msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'."
181 185 
 msgstr ""
182 186
183 
-#: clamav-milter.c:571
187 
+#: clamav-milter.c:575
184 188 
 msgid ""
185 189 
 "\n"
186 190 
 "For more information type \"man clamav-milter\"."
187 191 
 msgstr ""
188 192
189 
-#: clamav-milter.c:572
193 
+#: clamav-milter.c:576
190 194 
 msgid ""
191 195 
 "For bug reports, please refer to http://www.clamav.net/bugs.html#pagestart"
192 196 
 msgstr ""
193 197
194 
-#: clamav-milter.c:827
198 
+#: clamav-milter.c:834
195 199 
 #, c-format
196 200 
 msgid "%s: %s, -I may only be given once"
197 201 
 msgstr ""
198 202
199 
-#: clamav-milter.c:833
203 
+#: clamav-milter.c:840
200 204 
 #, c-format
201 205 
 msgid "%s: Cannot convert -I%s to IPaddr"
202 206 
 msgstr ""
203 207
204 
-#: clamav-milter.c:946
208 
+#: clamav-milter.c:957
205 209 
 #, c-format
206 210 
 msgid "%s: No socket-addr given\n"
207 211 
 msgstr ""
208 212
209 
-#: clamav-milter.c:952
213 
+#: clamav-milter.c:963
210 214 
 #, c-format
211 215 
 msgid "%s: socket-addr (%s) doesn't agree with sendmail.cf\n"
212 216 
 msgstr ""
213 217
214 
-#: clamav-milter.c:967
218 
+#: clamav-milter.c:978
215 219 
 #, c-format
216 220 
 msgid "%s: when using inet: connection to sendmail you must enable --local\n"
217 221 
 msgstr ""
218 222
219 
-#: clamav-milter.c:979
223 
+#: clamav-milter.c:990
220 224 
 #, c-format
221 225 
 msgid "%s: Can't parse the config file %s\n"
222 226 
 msgstr ""
223 227
224 
-#: clamav-milter.c:986
228 
+#: clamav-milter.c:997
225 229 
 #, c-format
226 230 
 msgid "%s: --detect-forged-local-addresses is not compatible with --outgoing\n"
227 231 
 msgstr ""
228 232
229 
-#: clamav-milter.c:990
233 
+#: clamav-milter.c:1001
230 234 
 #, c-format
231 235 
 msgid "%s: --detect-forged-local-addresses is not compatible with --local\n"
232 236 
 msgstr ""
233 237
234 
-#: clamav-milter.c:994
238 
+#: clamav-milter.c:1005
235 239 
 #, c-format
236 240 
 msgid "%s: --detect-forged-local-addresses is not compatible with --force\n"
237 241 
 msgstr ""
238 242
239 
-#: clamav-milter.c:1038
243 
+#: clamav-milter.c:1049
240 244 
 #, c-format
241 245 
 msgid ""
242 246 
 "%s: The iface option to --broadcast is not supported on your operating "
243 247 
 "system\n"
244 248 
 msgstr ""
245 249
246 
-#: clamav-milter.c:1047
250 
+#: clamav-milter.c:1058
247 251 
 #, c-format
248 252 
 msgid "%s: Can't get information about user %s\n"
249 253 
 msgstr ""
250 254
251 
-#: clamav-milter.c:1058
255 
+#: clamav-milter.c:1069
252 256 
 #, c-format
253 257 
 msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n"
254 258 
 msgstr ""
255 259
256 
-#: clamav-milter.c:1072
260 
+#: clamav-milter.c:1083
257 261 
 #, c-format
258 262 
 msgid "%s: You cannot use black hole mode unless you are root\n"
259 263 
 msgstr ""
260 264
261 
-#: clamav-milter.c:1082
265 
+#: clamav-milter.c:1093
262 266 
 #, c-format
263 267 
 msgid "Running as user %s (UID %d, GID %d)\n"
264 268 
 msgstr ""
265 269
266 
-#: clamav-milter.c:1085
270 
+#: clamav-milter.c:1096
267 271 
 #, c-format
268 272 
 msgid "%s: running as root is not recommended (check \"User\" in %s)\n"
269 273 
 msgstr ""
270 274
271 
-#: clamav-milter.c:1088
275 
+#: clamav-milter.c:1099
272 276 
 #, c-format
273 277 
 msgid "%s: Only root can set an interface for --broadcast\n"
274 278 
 msgstr ""
275 279
276 
-#: clamav-milter.c:1093
280 
+#: clamav-milter.c:1104
277 281 
 #, c-format
278 282 
 msgid "%s: Advisory mode doesn't work with quarantine mode\n"
279 283 
 msgstr ""
280 284
281 
-#: clamav-milter.c:1101
285 
+#: clamav-milter.c:1112
282 286 
 #, c-format
283 287 
 msgid "%s: Advisory mode doesn't work with quarantine directories\n"
284 288 
 msgstr ""
285 289
286 
-#: clamav-milter.c:1107
290 
+#: clamav-milter.c:1118
287 291 
 #, c-format
288 292 
 msgid "%s: the quarantine directory must not contain the string 'ERROR'\n"
289 293 
 msgstr ""
290 294
291 
-#: clamav-milter.c:1113
295 
+#: clamav-milter.c:1124
292 296 
 #, c-format
293 297 
 msgid "%s: the quarantine directory must not contain the string 'FOUND'\n"
294 298 
 msgstr ""
295 299
296 
-#: clamav-milter.c:1119
300 
+#: clamav-milter.c:1130
297 301 
 #, c-format
298 302 
 msgid "%s: the quarantine directory must not contain the string 'OK'\n"
299 303 
 msgstr ""
300 304
301 
-#: clamav-milter.c:1136
305 
+#: clamav-milter.c:1147
302 306 
 #, c-format
303 307 
 msgid "%s: insecure quarantine directory %s (mode 0%o)\n"
304 308 
 msgstr ""
305 309
306 
-#: clamav-milter.c:1177
310 
+#: clamav-milter.c:1188
307 311 
 #, c-format
308 312 
 msgid "%s: ReadTimeout must not be negative in %s\n"
309 313 
 msgstr ""
310 314
311 
-#: clamav-milter.c:1186
315 
+#: clamav-milter.c:1197
312 316 
 #, c-format
313 317 
 msgid "%s: StreamMaxLength must not be negative in %s\n"
314 318 
 msgstr ""
315 319
316 
-#: clamav-milter.c:1218
320 
+#: clamav-milter.c:1229
317 321 
 #, c-format
318 322 
 msgid ""
319 323 
 "%s: (-q && !LogSyslog): warning - all interception message methods are off\n"
320 324 
 msgstr ""
321 325
322 
-#: clamav-milter.c:1228
326 
+#: clamav-milter.c:1239
323 327 
 #, c-format
324 328 
 msgid "%s: --max-children must be given if --external is not given\n"
325 329 
 msgstr ""
326 330
327 
-#: clamav-milter.c:1232
331 
+#: clamav-milter.c:1243
328 332 
 #, c-format
329 333 
 msgid "%s: --freshclam_monitor must be at least one second\n"
330 334 
 msgstr ""
331 335
332 
-#: clamav-milter.c:1237
336 
+#: clamav-milter.c:1248
333 337 
 #, c-format
334 338 
 msgid "%s: --timeout must not be given if --external is not given\n"
335 339 
 msgstr ""
336 340
337 
-#: clamav-milter.c:1251
341 
+#: clamav-milter.c:1261
342 
+#, c-format
343 
+msgid "%s: No emails will be scanned"
344 
+msgstr ""
345 
+
346 
+#: clamav-milter.c:1272
338 347 
 #, c-format
339 348 
 msgid "%s: You can select one server type only (local/TCP) in %s\n"
340 349 
 msgstr ""
341 350
342 
-#: clamav-milter.c:1256
351 
+#: clamav-milter.c:1277
343 352 
 #, c-format
344 353 
 msgid "%s: You cannot use the --server option when using LocalSocket in %s\n"
345 354 
 msgstr ""
346 355
347 
-#: clamav-milter.c:1266
356 
+#: clamav-milter.c:1287
348 357 
 #, c-format
349 358 
 msgid "The connection from sendmail to %s (%s) must not\n"
350 359 
 msgstr ""
351 360
352 
-#: clamav-milter.c:1268
361 
+#: clamav-milter.c:1289
353 362 
 #, c-format
354 363 
 msgid "be the same as the connection to clamd (%s) in %s\n"
355 364 
 msgstr ""
356 365
357 
-#: clamav-milter.c:1278 clamav-milter.c:1301
366 
+#: clamav-milter.c:1299 clamav-milter.c:1326
358 367 
 #, c-format
359 368 
 msgid "Can't talk to clamd server via %s\n"
360 369 
 msgstr ""
361 370
362 
-#: clamav-milter.c:1280 clamav-milter.c:1303
371 
+#: clamav-milter.c:1301 clamav-milter.c:1328
363 372 
 #, c-format
364 373 
 msgid "Check your entry for LocalSocket in %s\n"
365 374 
 msgstr ""
366 375
367 
-#: clamav-milter.c:1314
376 
+#: clamav-milter.c:1339
368 377 
 msgid "Can't create a clamd session"
369 378 
 msgstr ""
370 379
371 
-#: clamav-milter.c:1331
380 
+#: clamav-milter.c:1356
372 381 
 #, c-format
373 382 
 msgid "%s: --quarantine-dir not supported for TCPSocket - use --quarantine\n"
374 383 
 msgstr ""
375 384
376 
-#: clamav-milter.c:1346
385 
+#: clamav-milter.c:1371
377 386 
 #, c-format
378 387 
 msgid "%s: hostname %s is longer than %d characters\n"
379 388 
 msgstr ""
380 389
381 
-#: clamav-milter.c:1365 clamav-milter.c:1465
390 
+#: clamav-milter.c:1390 clamav-milter.c:1494
382 391 
 #, c-format
383 392 
 msgid "%s: --max-children must be given in sessions mode\n"
384 393 
 msgstr ""
385 394
386 
-#: clamav-milter.c:1371
395 
+#: clamav-milter.c:1396
387 396 
 #, c-format
388 397 
 msgid ""
389 398 
 "%1$s: --max-children (%2$d) is lower than the number of servers you have (%3"
390 399 
 "$d)\n"
391 400 
 msgstr ""
392 401
393 
-#: clamav-milter.c:1394
402 
+#: clamav-milter.c:1423
394 403 
 #, c-format
395 404 
 msgid "%s: Unknown host %s\n"
396 405 
 msgstr ""
397 406
398 
-#: clamav-milter.c:1406
407 
+#: clamav-milter.c:1435
399 408 
 #, c-format
400 409 
 msgid "Can't talk to clamd server %s on port %d\n"
401 410 
 msgstr ""
402 411
403 
-#: clamav-milter.c:1410
412 
+#: clamav-milter.c:1439
404 413 
 #, c-format
405 414 
 msgid "Check the value for TCPAddr in %s\n"
406 415 
 msgstr ""
407 416
408 
-#: clamav-milter.c:1412
417 
+#: clamav-milter.c:1441
409 418 
 #, c-format
410 419 
 msgid "Check the value for TCPAddr in clamd.conf on %s\n"
411 420 
 msgstr ""
412 421
413 
-#: clamav-milter.c:1428
422 
+#: clamav-milter.c:1457
414 423 
 msgid "Can't find any active clamd servers\n"
415 424 
 msgstr ""
416 425
417 
-#: clamav-milter.c:1429 clamav-milter.c:1435
426 
+#: clamav-milter.c:1458 clamav-milter.c:1464
418 427 
 #, c-format
419 428 
 msgid "Check your entry for TCPSocket in %s\n"
420 429 
 msgstr ""
421 430
422 
-#: clamav-milter.c:1434
431 
+#: clamav-milter.c:1463
423 432 
 msgid "Can't find any clamd servers\n"
424 433 
 msgstr ""
425 434
426 
-#: clamav-milter.c:1438
435 
+#: clamav-milter.c:1467
427 436 
 msgid "Can't find any clamd server"
428 437 
 msgstr ""
429 438
430 
-#: clamav-milter.c:1445
439 
+#: clamav-milter.c:1474
431 440 
 #, c-format
432 441 
 msgid "%s: You must select server type (local/TCP) in %s\n"
433 442 
 msgstr ""
434 443
435 
-#: clamav-milter.c:1515
444 
+#: clamav-milter.c:1565
436 445 
 #, c-format
437 446 
 msgid "When debugging it is recommended that you use Foreground mode in %s\n"
438 447 
 msgstr ""
439 448
440 
-#: clamav-milter.c:1516
449 
+#: clamav-milter.c:1566
441 450 
 msgid "\tso that you can see all of the messages"
442 451 
 msgstr ""
443 452
444 
-#: clamav-milter.c:1605
453 
+#: clamav-milter.c:1655
445 454 
 #, c-format
446 455 
 msgid "%s: ScanMail not defined in %s (needed without --external), enabling\n"
447 456 
 msgstr ""
448 457
449 
-#: clamav-milter.c:1662
458 
+#: clamav-milter.c:1712
450 459 
 msgid "Starting clamav-milter"
451 460 
 msgstr ""
452 461
453 
-#: clamav-milter.c:1672
462 
+#: clamav-milter.c:1722
454 463 
 #, c-format
455 464 
 msgid "pidfile: '%s' must be a full pathname"
456 465 
 msgstr ""
457 466
458 
-#: clamav-milter.c:1674
467 
+#: clamav-milter.c:1724
459 468 
 #, c-format
460 469 
 msgid "pidfile '%s' must be a full pathname\n"
461 470 
 msgstr ""
462 471
463 
-#: clamav-milter.c:1688
472 
+#: clamav-milter.c:1738
464 473 
 #, c-format
465 474 
 msgid "Can't save PID in file %s"
466 475 
 msgstr ""
467 476
468 
-#: clamav-milter.c:1690
477 
+#: clamav-milter.c:1740
469 478 
 #, c-format
470 479 
 msgid "Can't save PID in file %s\n"
471 480 
 msgstr ""
472 481
473 
-#: clamav-milter.c:1752
482 
+#: clamav-milter.c:1802
474 483 
 #, c-format
475 484 
 msgid "Starting %s"
476 485 
 msgstr ""
477 486
478 
-#: clamav-milter.c:1755
487 
+#: clamav-milter.c:1805
479 488 
 msgid "Debugging is on"
480 489 
 msgstr ""
481 490
482 
-#: clamav-milter.c:1832
491 
+#: clamav-milter.c:1882
483 492 
 #, c-format
484 493 
 msgid "Check clamd server %s - it may be down\n"
485 494 
 msgstr ""
486 495
487 
-#: clamav-milter.c:1837
496 
+#: clamav-milter.c:1887
488 497 
 msgid "Check clamd server - it may be down"
489 498 
 msgstr ""
490 499
491 
-#: clamav-milter.c:2038
500 
+#: clamav-milter.c:2092
492 501 
 msgid "No free clamd sessions\n"
493 502 
 msgstr ""
494 503
495 
-#: clamav-milter.c:2094
496 
-#, c-format
497 
-msgid "!FindServer: looking for %1$d from %2$d - report to bugs@clamav.net\n"
498 
-msgstr ""
499 
-
500 
-#: clamav-milter.c:2131
504 
+#: clamav-milter.c:2170
501 505 
 #, c-format
502 506 
 msgid "^Check clamd server %s - it may be down\n"
503 507 
 msgstr ""
504 508
505 
-#: clamav-milter.c:2136
509 
+#: clamav-milter.c:2175
506 510 
 msgid "Check clamd server - it may be down\n"
507 511 
 msgstr ""
508 512
509 
-#: clamav-milter.c:2172
513 
+#: clamav-milter.c:2214
510 514 
 msgid "findServer: select failed"
511 515 
 msgstr ""
512 516
513 
-#: clamav-milter.c:2186
517 
+#: clamav-milter.c:2228
514 518 
 msgid "findServer: No response from any server\n"
515 519 
 msgstr ""
516 520
517 
-#: clamav-milter.c:2188
521 
+#: clamav-milter.c:2230
518 522 
 msgid "findServer: No response from any server"
519 523 
 msgstr ""
520 524
521 
-#: clamav-milter.c:2211
525 
+#: clamav-milter.c:2253
522 526 
 msgid "clamfi_connect: ctx is null"
523 527 
 msgstr ""
524 528
525 
-#: clamav-milter.c:2216
529 
+#: clamav-milter.c:2258
526 530 
 msgid "clamfi_connect: hostname is null"
527 531 
 msgstr ""
528 532
529 
-#: clamav-milter.c:2237
533 
+#: clamav-milter.c:2279
530 534 
 msgid "clamfi_connect: remoteIP is null"
531 535 
 msgstr ""
532 536
533 
-#: clamav-milter.c:2246
537 
+#: clamav-milter.c:2288
534 538 
 #, c-format
535 539 
 msgid "clamfi_connect: connection from %s"
536 540 
 msgstr ""
537 541
538 
-#: clamav-milter.c:2247
542 
+#: clamav-milter.c:2289
539 543 
 #, c-format
540 544 
 msgid "clamfi_connect: connection from %s\n"
541 545 
 msgstr ""
542 546
543 
-#: clamav-milter.c:2250
547 
+#: clamav-milter.c:2292
544 548 
 #, c-format
545 549 
 msgid "clamfi_connect: connection from %s [%s]"
546 550 
 msgstr ""
547 551
548 
-#: clamav-milter.c:2251
552 
+#: clamav-milter.c:2293
549 553 
 #, c-format
550 554 
 msgid "clamfi_connect: connection from %s [%s]\n"
551 555 
 msgstr ""
552 556
553 
-#: clamav-milter.c:2271
557 
+#: clamav-milter.c:2313
554 558 
 msgid "Can't get sendmail hostname"
555 559 
 msgstr ""
556 560
557 
-#: clamav-milter.c:2280
561 
+#: clamav-milter.c:2322
558 562 
 #, c-format
559 563 
 msgid "Access Denied: Host Unknown (%s)"
560 564 
 msgstr ""
561 565
562 
-#: clamav-milter.c:2289
566 
+#: clamav-milter.c:2331
563 567 
 #, c-format
564 568 
 msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n"
565 569 
 msgstr ""
566 570
567 
-#: clamav-milter.c:2300
571 
+#: clamav-milter.c:2342
568 572 
 #, c-format
569 573 
 msgid "Access Denied: Can't get IP address for (%s)"
570 574 
 msgstr ""
571 575
572 
-#: clamav-milter.c:2317
576 
+#: clamav-milter.c:2359
573 577 
 #, c-format
574 578 
 msgid "Access Denied for %s[%s]"
575 579 
 msgstr ""
576 580
577 
-#: clamav-milter.c:2335
581 
+#: clamav-milter.c:2377
578 582 
 msgid "clamfi_connect: not scanning outgoing messages"
579 583 
 msgstr ""
580 584
581 
-#: clamav-milter.c:2336
585 
+#: clamav-milter.c:2378
582 586 
 msgid "clamfi_connect: not scanning outgoing messages\n"
583 587 
 msgstr ""
584 588
585 
-#: clamav-milter.c:2344
589 
+#: clamav-milter.c:2386
586 590 
 msgid "clamfi_connect: not scanning local messages"
587 591 
 msgstr ""
588 592
589 
-#: clamav-milter.c:2345
593 
+#: clamav-milter.c:2387
590 594 
 msgid "clamfi_connect: not scanning local messages\n"
591 595 
 msgstr ""
592 596
593 
-#: clamav-milter.c:2359
597 
+#: clamav-milter.c:2401
594 598 
 msgid "clamfi_connect: gethostname failed"
595 599 
 msgstr ""
596 600
597 
-#: clamav-milter.c:2364
601 
+#: clamav-milter.c:2406
598 602 
 msgid "Rejected email falsely claiming to be from here"
599 603 
 msgstr ""
600 604
601 
-#: clamav-milter.c:2365
605 
+#: clamav-milter.c:2407
602 606 
 msgid "You have claimed to be me, but you are not"
603 607 
 msgstr ""
604 608
605 
-#: clamav-milter.c:2366 clamav-milter.c:2718
609 
+#: clamav-milter.c:2408 clamav-milter.c:2758
606 610 
 msgid "Forged local address detected"
607 611 
 msgstr ""
608 612
609 
-#: clamav-milter.c:2378
613 
+#: clamav-milter.c:2420
610 614 
 msgid "Your IP is blacklisted"
611 615 
 msgstr ""
612 616
613 
-#: clamav-milter.c:2379
617 
+#: clamav-milter.c:2421
614 618 
 msgid "Blacklisted IP detected"
615 619 
 msgstr ""
616 620
617 
-#: clamav-milter.c:2443
621 
+#: clamav-milter.c:2485
618 622 
 msgid "Rejected email with empty from field"
619 623 
 msgstr ""
620 624
621 
-#: clamav-milter.c:2444
625 
+#: clamav-milter.c:2486
622 626 
 msgid "You have not said who the email is from"
623 627 
 msgstr ""
624 628
625 
-#: clamav-milter.c:2445
629 
+#: clamav-milter.c:2487
626 630 
 msgid "Reject email with empty from field"
627 631 
 msgstr ""
628 632
629 
-#: clamav-milter.c:2482
633 
+#: clamav-milter.c:2524
630 634 
 #, c-format
631 635 
 msgid "hit max-children limit (%u >= %u)\n"
632 636 
 msgstr ""
633 637
634 
-#: clamav-milter.c:2483
638 
+#: clamav-milter.c:2525
635 639 
 #, c-format
636 640 
 msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"
637 641 
 msgstr ""
638 642
639 
-#: clamav-milter.c:2489
643 
+#: clamav-milter.c:2531
640 644 
 #, c-format
641 645 
 msgid "hit max-children limit (%u >= %u)"
642 646 
 msgstr ""
643 647
644 
-#: clamav-milter.c:2490
648 
+#: clamav-milter.c:2532
645 649 
 #, c-format
646 650 
 msgid "hit max-children limit (%u >= %u): waiting for some to exit"
647 651 
 msgstr ""
648 652
649 
-#: clamav-milter.c:2495
653 
+#: clamav-milter.c:2537
650 654 
 msgid "AV system temporarily overloaded - please try later"
651 655 
 msgstr ""
652 656
653 
-#: clamav-milter.c:2518
657 
+#: clamav-milter.c:2558
654 658 
 #, c-format
655 659 
 msgid "n_children %u: waiting %d seconds for some to exit"
656 660 
 msgstr ""
657 661
658 
-#: clamav-milter.c:2534
662 
+#: clamav-milter.c:2574
659 663 
 #, c-format
660 664 
 msgid "Finished waiting, n_children = %u"
661 665 
 msgstr ""
662 666
663 
-#: clamav-milter.c:2545
667 
+#: clamav-milter.c:2585
664 668 
 msgid "Timeout waiting for a child to die"
665 669 
 msgstr ""
666 670
667 
-#: clamav-milter.c:2547
671 
+#: clamav-milter.c:2587
668 672 
 msgid "Timeout waiting for a child to die\n"
669 673 
 msgstr ""
670 674
671 
-#: clamav-milter.c:2683
675 
+#: clamav-milter.c:2723
672 676 
 msgid "clamfi_eoh"
673 677 
 msgstr ""
674 678
675 
-#: clamav-milter.c:2686
679 
+#: clamav-milter.c:2726
676 680 
 msgid "clamfi_eoh\n"
677 681 
 msgstr ""
678 682
679 
-#: clamav-milter.c:2710
683 
+#: clamav-milter.c:2750
680 684 
 msgid "clamfi_eoh: gethostname failed"
681 685 
 msgstr ""
682 686
683 
-#: clamav-milter.c:2716
687 
+#: clamav-milter.c:2756
684 688 
 #, c-format
685 689 
 msgid "Rejected email falsely claiming to be from %s"
686 690 
 msgstr ""
687 691
688 
-#: clamav-milter.c:2717
692 
+#: clamav-milter.c:2757
689 693 
 msgid "You have claimed to be from me, but you are not"
690 694 
 msgstr ""
691 695
692 
-#: clamav-milter.c:2764
696 
+#: clamav-milter.c:2804
693 697 
 msgid "clamfi_eoh: ignoring whitelisted message"
694 698 
 msgstr ""
695 699
696 
-#: clamav-milter.c:2766
700 
+#: clamav-milter.c:2806
697 701 
 msgid "clamfi_eoh: ignoring whitelisted message\n"
698 702 
 msgstr ""
699 703
700 
-#: clamav-milter.c:2780
704 
+#: clamav-milter.c:2820
701 705 
 #, c-format
702 706 
 msgid "clamfi_envbody: %u bytes"
703 707 
 msgstr ""
704 708
705 
-#: clamav-milter.c:2782
709 
+#: clamav-milter.c:2822
706 710 
 #, c-format
707 711 
 msgid "clamfi_envbody: %u bytes\n"
708 712 
 msgstr ""
709 713
710 
-#: clamav-milter.c:2839 clamav-milter.c:3143
714 
+#: clamav-milter.c:2879 clamav-milter.c:3185
711 715 
 #, c-format
712 716 
 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"
713 717 
 msgstr ""
714 718
715 
-#: clamav-milter.c:2843 clamav-milter.c:3146
719 
+#: clamav-milter.c:2883 clamav-milter.c:3188
716 720 
 msgid "Not Scanned - StreamMaxLength exceeded"
717 721 
 msgstr ""
718 722
719 
-#: clamav-milter.c:2896
723 
+#: clamav-milter.c:2936
720 724 
 #, c-format
721 725 
 msgid "Failed to delete X-Virus-Status header %d"
722 726 
 msgstr ""
723 727
724 
-#: clamav-milter.c:2965
728 
+#: clamav-milter.c:3007
725 729 
 #, c-format
726 730 
 msgid "failed to send SCAN %s command to clamd"
727 731 
 msgstr ""
728 732
729 
-#: clamav-milter.c:2987
733 
+#: clamav-milter.c:3029
730 734 
 msgid "failed to send SCAN command to clamd"
731 735 
 msgstr ""
732 736
733 
-#: clamav-milter.c:3004
737 
+#: clamav-milter.c:3046
734 738 
 #, c-format
735 739 
 msgid "Waiting to read status from fd %d\n"
736 740 
 msgstr ""
737 741
738 
-#: clamav-milter.c:3017
742 
+#: clamav-milter.c:3059
739 743 
 #, c-format
740 744 
 msgid "clamfi_eom: read %s"
741 745 
 msgstr ""
742 746
743 
-#: clamav-milter.c:3018
747 
+#: clamav-milter.c:3060
744 748 
 #, c-format
745 749 
 msgid "clamfi_eom: read %s\n"
746 750 
 msgstr ""
747 751
748 
-#: clamav-milter.c:3035
752 
+#: clamav-milter.c:3077
749 753 
 #, c-format
750 754 
 msgid "clamfi_eom: read nothing from clamd on %s"
751 755 
 msgstr ""
752 756
753 
-#: clamav-milter.c:3037
757 
+#: clamav-milter.c:3079
754 758 
 #, c-format
755 759 
 msgid "clamfi_eom: read nothing from clamd on %s\n"
756 760 
 msgstr ""
757 761
758 
-#: clamav-milter.c:3082 clamav-milter.c:3128
762 
+#: clamav-milter.c:3124 clamav-milter.c:3170
759 763 
 msgid "Error determining host"
760 764 
 msgstr ""
761 765
762 
-#: clamav-milter.c:3151
766 
+#: clamav-milter.c:3193
763 767 
 msgid "Not Scanned"
764 768 
 msgstr ""
765 769
766 
-#: clamav-milter.c:3180
770 
+#: clamav-milter.c:3222
767 771 
 msgid "Infected with"
768 772 
 msgstr ""
769 773
770 
-#: clamav-milter.c:3204
774 
+#: clamav-milter.c:3246
771 775 
 #, c-format
772 776 
 msgid "Intercepted virus from %s to"
773 777 
 msgstr ""
774 778
775 
-#: clamav-milter.c:3298
779 
+#: clamav-milter.c:3340
776 780 
 msgid "Subject: Virus intercepted\n"
777 781 
 msgstr ""
778 782
779 
-#: clamav-milter.c:3314
783 
+#: clamav-milter.c:3356
780 784 
 #, c-format
781 785 
 msgid "Can't open e-mail template header file %s"
782 786 
 msgstr ""
783 787
784 
-#: clamav-milter.c:3329 clamav-milter.c:3333
788 
+#: clamav-milter.c:3371 clamav-milter.c:3375
785 789 
 msgid "\n"
786 790 
 msgstr ""
787 791
788 
-#: clamav-milter.c:3341
792 
+#: clamav-milter.c:3383
789 793 
 msgid "A message you sent to\n"
790 794 
 msgstr ""
791 795
792 
-#: clamav-milter.c:3348
796 
+#: clamav-milter.c:3390
793 797 
 #, c-format
794 798 
 msgid "The message %1$s sent from %2$s to\n"
795 799 
 msgstr ""
796 800
797 
-#: clamav-milter.c:3351
801 
+#: clamav-milter.c:3393
798 802 
 #, c-format
799 803 
 msgid "A message sent from %s to\n"
800 804 
 msgstr ""
801 805
802 
-#: clamav-milter.c:3356
806 
+#: clamav-milter.c:3398
803 807 
 #, c-format
804 808 
 msgid "contained %s and has not been accepted for delivery.\n"
805 809 
 msgstr ""
806 810
807 
-#: clamav-milter.c:3359
811 
+#: clamav-milter.c:3401
808 812 
 #, c-format
809 813 
 msgid ""
810 814 
 "\n"
811 815 
 "The message in question has been quarantined as %s\n"
812 816 
 msgstr ""
813 817
814 
-#: clamav-milter.c:3362
818 
+#: clamav-milter.c:3404
815 819 
 #, c-format
816 820 
 msgid ""
817 821 
 "\n"
... ... 
@@ -819,13 +823,13 @@ msgid ""
819 819 
 "\n"
820 820 
 msgstr ""
821 821
822 
-#: clamav-milter.c:3365
822 
+#: clamav-milter.c:3407
823 823 
 msgid ""
824 824 
 "For your information, the original message headers were:\n"
825 825 
 "\n"
826 826 
 msgstr ""
827 827
828 
-#: clamav-milter.c:3378
828 
+#: clamav-milter.c:3420
829 829 
 #, c-format
830 830 
 msgid ""
831 831 
 "\n"
... ... 
@@ -833,270 +837,261 @@ msgid ""
833 833 
 "%s\t\n"
834 834 
 msgstr ""
835 835
836 
-#: clamav-milter.c:3386
836 
+#: clamav-milter.c:3428
837 837 
 #, c-format
838 838 
 msgid "%s: Failed to notify clamAV interception - see dead.letter"
839 839 
 msgstr ""
840 840
841 
-#: clamav-milter.c:3388
841 
+#: clamav-milter.c:3430
842 842 
 #, c-format
843 843 
 msgid "Can't execute '%s' to send virus notice"
844 844 
 msgstr ""
845 845
846 
-#: clamav-milter.c:3419
846 
+#: clamav-milter.c:3458
847 847 
 #, c-format
848 
-msgid "Reported phishing to %s"
849 
-msgstr ""
850 
-
851 
-#: clamav-milter.c:3423
852 
-msgid "Can't set anti-phish header"
848 
+msgid "#Reported phishing to %s"
853 849 
 msgstr ""
854 850
855 
-#: clamav-milter.c:3425
856 
-msgid "Can't set anti-phish header\n"
857 
-msgstr ""
858 
-
859 
-#: clamav-milter.c:3451
860 
-#, c-format
861 
-msgid "Can't set quarantine user %s"
851 
+#: clamav-milter.c:3460
852 
+msgid "^Can't set anti-phish header\n"
862 853 
 msgstr ""
863 854
864 
-#: clamav-milter.c:3453
855 
+#: clamav-milter.c:3478
865 856 
 #, c-format
866 
-msgid "Can't set quarantine user %s\n"
857 
+msgid "^Can't set quarantine user %s"
867 858 
 msgstr ""
868 859
869 
-#: clamav-milter.c:3482
860 
+#: clamav-milter.c:3502
870 861 
 #, c-format
871 862 
 msgid "virus %s detected by ClamAV - http://www.clamav.net"
872 863 
 msgstr ""
873 864
874 
-#: clamav-milter.c:3496
865 
+#: clamav-milter.c:3514
875 866 
 msgid "Unknown"
876 867 
 msgstr ""
877 868
878 
-#: clamav-milter.c:3498
869 
+#: clamav-milter.c:3516
879 870 
 #, c-format
880 871 
 msgid "%s: incorrect message \"%s\" from clamd"
881 872 
 msgstr ""
882 873
883 
-#: clamav-milter.c:3504
874 
+#: clamav-milter.c:3522
884 875 
 msgid "Clean"
885 876 
 msgstr ""
886 877
887 
-#: clamav-milter.c:3508
878 
+#: clamav-milter.c:3526
888 879 
 #, c-format
889 880 
 msgid "%s: clean message from %s"
890 881 
 msgstr ""
891 882
892 
-#: clamav-milter.c:3510
883 
+#: clamav-milter.c:3528
893 884 
 msgid "an unknown sender"
894 885 
 msgstr ""
895 886
896 
-#: clamav-milter.c:3606
887 
+#: clamav-milter.c:3624
897 888 
 #, c-format
898 889 
 msgid "Can't remove clean file %s"
899 890 
 msgstr ""
900 891
901 
-#: clamav-milter.c:3804 clamav-milter.c:3807
892 
+#: clamav-milter.c:3817 clamav-milter.c:3820
902 893 
 #, c-format
903 894 
 msgid "write failure (%u bytes) to %s: %s"
904 895 
 msgstr ""
905 896
906 
-#: clamav-milter.c:3821 clamav-milter.c:3824
897 
+#: clamav-milter.c:3834 clamav-milter.c:3837
907 898 
 #, c-format
908 899 
 msgid "write failure (%u bytes) to clamd: %s"
909 900 
 msgstr ""
910 901
911 
-#: clamav-milter.c:3902
902 
+#: clamav-milter.c:3915
912 903 
 #, c-format
913 904 
 msgid "No data received from clamd in %d seconds\n"
914 905 
 msgstr ""
915 906
916 
-#: clamav-milter.c:3931
907 
+#: clamav-milter.c:3944
917 908 
 #, c-format
918 909 
 msgid "Can't stat %s"
919 910 
 msgstr ""
920 911
921 
-#: clamav-milter.c:3942 clamav-milter.c:4389
912 
+#: clamav-milter.c:3955 clamav-milter.c:4402
922 913 
 #, c-format
923 914 
 msgid "Can't open %s"
924 915 
 msgstr ""
925 916
926 
-#: clamav-milter.c:4067 clamav-milter.c:4569
917 
+#: clamav-milter.c:4080 clamav-milter.c:4582
927 918 
 #, c-format
928 919 
 msgid "mkdir %s failed"
929 920 
 msgstr ""
930 921
931 
-#: clamav-milter.c:4082
922 
+#: clamav-milter.c:4095
932 923 
 #, c-format
933 924 
 msgid "mktemp %s failed"
934 925 
 msgstr ""
935 926
936 
-#: clamav-milter.c:4092
927 
+#: clamav-milter.c:4105
937 928 
 #, c-format
938 929 
 msgid "Temporary quarantine file %s creation failed"
939 930 
 msgstr ""
940 931
941 
-#: clamav-milter.c:4197
932 
+#: clamav-milter.c:4210
942 933 
 #, c-format
943 934 
 msgid "failed to send STREAM command clamd server %d"
944 935 
 msgstr ""
945 936
946 
-#: clamav-milter.c:4206
937 
+#: clamav-milter.c:4219
947 938 
 msgid "failed to send STREAM command clamd"
948 939 
 msgstr ""
949 940
950 
-#: clamav-milter.c:4218
941 
+#: clamav-milter.c:4231
951 942 
 msgid "failed to create TCPSocket to talk to clamd"
952 943 
 msgstr ""
953 944
954 
-#: clamav-milter.c:4230 clamav-milter.c:4246
945 
+#: clamav-milter.c:4243 clamav-milter.c:4259
955 946 
 msgid "recv failed from clamd getting PORT"
956 947 
 msgstr ""
957 948
958 
-#: clamav-milter.c:4234 clamav-milter.c:4248
949 
+#: clamav-milter.c:4247 clamav-milter.c:4261
959 950 
 msgid "EOF from clamd getting PORT"
960 951 
 msgstr ""
961 952
962 
-#: clamav-milter.c:4259
953 
+#: clamav-milter.c:4272
963 954 
 #, c-format
964 955 
 msgid "Expected port information from clamd, got '%s'"
965 956 
 msgstr ""
966 957
967 
-#: clamav-milter.c:4262
958 
+#: clamav-milter.c:4275
968 959 
 #, c-format
969 960 
 msgid "Expected port information from clamd, got '%s'\n"
970 961 
 msgstr ""
971 962
972 
-#: clamav-milter.c:4282 clamav-milter.c:4285
963 
+#: clamav-milter.c:4295 clamav-milter.c:4298
973 964 
 #, c-format
974 965 
 msgid "Connecting to local port %d - data %d cmd %d\n"
975 966 
 msgstr ""
976 967
977 
-#: clamav-milter.c:4300 clamav-milter.c:4303
968 
+#: clamav-milter.c:4313 clamav-milter.c:4316
978 969 
 #, c-format
979 970 
 msgid "Failed to connect to port %d given by clamd: %s"
980 971 
 msgstr ""
981 972
982 
-#: clamav-milter.c:4401
973 
+#: clamav-milter.c:4414
983 974 
 #, c-format
984 975 
 msgid "Clamd (pid %d) seems to have died"
985 976 
 msgstr ""
986 977
987 
-#: clamav-milter.c:4427
978 
+#: clamav-milter.c:4440
988 979 
 #, c-format
989 980 
 msgid "Can't open e-mail template file %s"
990 981 
 msgstr ""
991 982
992 
-#: clamav-milter.c:4436
983 
+#: clamav-milter.c:4449
993 984 
 #, c-format
994 985 
 msgid "Can't stat e-mail template file %s"
995 986 
 msgstr ""
996 987
997 
-#: clamav-milter.c:4445
988 
+#: clamav-milter.c:4458
998 989 
 msgid "Out of memory"
999 990 
 msgstr ""
1000 991
1001 
-#: clamav-milter.c:4451
992 
+#: clamav-milter.c:4464
1002 993 
 #, c-format
1003 994 
 msgid "Error reading e-mail template file %s"
1004 995 
 msgstr ""
1005 996
1006 
-#: clamav-milter.c:4480
997 
+#: clamav-milter.c:4493
1007 998 
 #, c-format
1008 999 
 msgid "%s: Unknown clamAV variable \"%c\"\n"
1009 1000 
 msgstr ""
1010 1001
1011 
-#: clamav-milter.c:4491
1002 
+#: clamav-milter.c:4504
1012 1003 
 #, c-format
1013 1004 
 msgid "%s: Unterminated sendmail variable \"%s\"\n"
1014 1005 
 msgstr ""
1015 1006
1016 
-#: clamav-milter.c:4502
1007 
+#: clamav-milter.c:4515
1017 1008 
 #, c-format
1018 1009 
 msgid "%s: Unknown sendmail variable \"%s\"\n"
1019 1010 
 msgstr ""
1020 1011
1021 
-#: clamav-milter.c:4595
1012 
+#: clamav-milter.c:4608
1022 1013 
 #, c-format
1023 1014 
 msgid "Can't rename %1$s to %2$s"
1024 1015 
 msgstr ""
1025 1016
1026 
-#: clamav-milter.c:4604
1017 
+#: clamav-milter.c:4617
1027 1018 
 #, c-format
1028 1019 
 msgid "Email quarantined as %s"
1029 1020 
 msgstr ""
1030 1021
1031 
-#: clamav-milter.c:4708
1022 
+#: clamav-milter.c:4721
1032 1023 
 #, c-format
1033 1024 
 msgid "[Virus] %s"
1034 1025 
 msgstr ""
1035 1026
1036 
-#: clamav-milter.c:4805
1027 
+#: clamav-milter.c:4818
1037 1028 
 msgid ""
1038 1029 
 "!No response from any clamd server - your AV system is not scanning emails\n"
1039 1030 
 msgstr ""
1040 1031
1041 
-#: clamav-milter.c:4823
1032 
+#: clamav-milter.c:4836
1042 1033 
 msgid "Subject: ClamAV Down\n"
1043 1034 
 msgstr ""
1044 1035
1045 
-#: clamav-milter.c:4826
1036 
+#: clamav-milter.c:4839
1046 1037 
 msgid ""
1047 1038 
 "This is an automatic message\n"
1048 1039 
 "\n"
1049 1040 
 msgstr ""
1050 1041
1051 
-#: clamav-milter.c:4829
1042 
+#: clamav-milter.c:4842
1052 1043 
 msgid "The clamd program cannot be contacted.\n"
1053 1044 
 msgstr ""
1054 1045
1055 
-#: clamav-milter.c:4831
1046 
+#: clamav-milter.c:4844
1056 1047 
 msgid "No clamd server can be contacted.\n"
1057 1048 
 msgstr ""
1058 1049
1059 
-#: clamav-milter.c:4833
1050 
+#: clamav-milter.c:4846
1060 1051 
 msgid "Emails may not be being scanned, please check your servers.\n"
1061 1052 
 msgstr ""
1062 1053
1063 
-#: clamav-milter.c:5066
1054 
+#: clamav-milter.c:5079
1064 1055 
 msgid "Loading new database"
1065 1056 
 msgstr ""
1066 1057
1067 
-#: clamav-milter.c:5103
1058 
+#: clamav-milter.c:5116
1068 1059 
 #, c-format
1069 1060 
 msgid "Stopping %s"
1070 1061 
 msgstr ""
1071 1062
1072 
-#: clamav-milter.c:5151
1063 
+#: clamav-milter.c:5164
1073 1064 
 msgid "Stopping clamav-milter"
1074 1065 
 msgstr ""
1075 1066
1076 
-#: clamav-milter.c:5278
1067 
+#: clamav-milter.c:5291
1077 1068 
 #, c-format
1078 1069 
 msgid "Loaded %s"
1079 1070 
 msgstr ""
1080 1071
1081 
-#: clamav-milter.c:5282
1072 
+#: clamav-milter.c:5295
1082 1073 
 #, c-format
1083 1074 
 msgid "ClamAV: Protecting against %u viruses"
1084 1075 
 msgstr ""
1085 1076
1086 
-#: clamav-milter.c:5436
1077 
+#: clamav-milter.c:5449
1087 1078 
 #, c-format
1088 1079 
 msgid "Can't open whitelist file %s"
1089 1080 
 msgstr ""
1090 1081
1091 
-#: clamav-milter.c:5444
1082 
+#: clamav-milter.c:5457
1092 1083 
 msgid "Can't create whitelist table"
1093 1084 
 msgstr ""
1094 1085
1095 
-#: clamav-milter.c:5503
1086 
+#: clamav-milter.c:5516
1096 1087 
 msgid "Can't create blacklist table"
1097 1088 
 msgstr ""
1098 1089
1099 
-#: clamav-milter.c:5753
1090 
+#: clamav-milter.c:5743
1100 1091 
 #, c-format
1101 1092 
 msgid "Can't execute '%s' to expand '%s'"
1102 1093 
 msgstr ""