Browse code

Up issued

git-svn: trunk@1256

Nigel Horne authored on 2005/01/19 14:27:39
Showing 3 changed files
... ...
@@ -640,6 +640,7 @@ Changes
640 640
 		from a server that is down
641 641
 0.80gg	12/1/05:	Fixed DNS resolution error messages which could print
642 642
 		the incorrect hostname that is not being resolved
643
+0.81	19/1/05:	Up issued
643 644
 
644 645
 INTERNATIONALISATION
645 646
 
... ...
@@ -26,6 +26,9 @@
26 26
  *
27 27
  * Change History:
28 28
  * $Log: clamav-milter.c,v $
29
+ * Revision 1.169  2005/01/19 05:27:39  nigelhorne
30
+ * Up issued
31
+ *
29 32
  * Revision 1.168  2005/01/12 08:57:05  nigelhorne
30 33
  * Fix DNS error messages
31 34
  *
... ...
@@ -515,9 +518,9 @@
515 515
  * Revision 1.6  2003/09/28 16:37:23  nigelhorne
516 516
  * Added -f flag use MaxThreads if --max-children not set
517 517
  */
518
-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.168 2005/01/12 08:57:05 nigelhorne Exp $";
518
+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.169 2005/01/19 05:27:39 nigelhorne Exp $";
519 519
 
520
-#define	CM_VERSION	"0.80gg"
520
+#define	CM_VERSION	"0.81"
521 521
 
522 522
 #if HAVE_CONFIG_H
523 523
 #include "clamav-config.h"
... ...
@@ -629,6 +632,8 @@ typedef	unsigned int	in_addr_t;
629 629
  * TODO: Files can be scanned with "SCAN" not "STREAM" if clamd is on the same
630 630
  *	machine when talking via INET domain socket.
631 631
  * TODO: Load balancing, allow local machine to talk via UNIX domain socket.
632
+ * TODO: Read the input socket name from sendmail.mc/sendmail.cf, or at least
633
+ *	sanity check that they're the same
632 634
  */
633 635
 
634 636
 struct header_node_t {
... ...
@@ -1728,6 +1733,7 @@ main(int argc, char **argv)
1728 1728
 #ifndef	CL_DEBUG
1729 1729
 		close(1);
1730 1730
 		close(2);
1731
+		/* FIXME: use LogFile if that is set */
1731 1732
 		if((open("/dev/console", O_WRONLY) == 1) ||
1732 1733
 		   (open("/dev/null", O_WRONLY) == 1))
1733 1734
 			dup(1);
... ...
@@ -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: 2005-01-12 08:53+0000\n"
11
+"POT-Creation-Date: 2005-01-19 05:15+0000\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,630 +16,630 @@ msgstr ""
16 16
 "Content-Type: text/plain; charset=CHARSET\n"
17 17
 "Content-Transfer-Encoding: 8bit\n"
18 18
 
19
-#: clamav-milter.c:921
19
+#: clamav-milter.c:926
20 20
 msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them."
21 21
 msgstr ""
22 22
 
23
-#: clamav-milter.c:922
23
+#: clamav-milter.c:927
24 24
 msgid "\t--bounce\t\t-b\tSend a failure message to the sender."
25 25
 msgstr ""
26 26
 
27
-#: clamav-milter.c:923
27
+#: clamav-milter.c:928
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:924
33
+#: clamav-milter.c:929
34 34
 msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE."
35 35
 msgstr ""
36 36
 
37
-#: clamav-milter.c:925
37
+#: clamav-milter.c:930
38 38
 msgid "\t--debug\t\t\t-D\tPrint debug messages."
39 39
 msgstr ""
40 40
 
41
-#: clamav-milter.c:926
41
+#: clamav-milter.c:931
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:927
46
+#: clamav-milter.c:932
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:928
52
+#: clamav-milter.c:933
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:929
56
+#: clamav-milter.c:934
57 57
 msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."
58 58
 msgstr ""
59 59
 
60
-#: clamav-milter.c:930
60
+#: clamav-milter.c:935
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:931
64
+#: clamav-milter.c:936
65 65
 msgid "\t--help\t\t\t-h\tThis message."
66 66
 msgstr ""
67 67
 
68
-#: clamav-milter.c:932
68
+#: clamav-milter.c:937
69 69
 msgid "\t--headers\t\t-H\tInclude original message headers in the report."
70 70
 msgstr ""
71 71
 
72
-#: clamav-milter.c:933
72
+#: clamav-milter.c:938
73 73
 msgid "\t--internal\t\t-I\tUse the internal scanner."
74 74
 msgstr ""
75 75
 
76
-#: clamav-milter.c:934
76
+#: clamav-milter.c:939
77 77
 msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN."
78 78
 msgstr ""
79 79
 
80
-#: clamav-milter.c:935
80
+#: clamav-milter.c:940
81 81
 msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans."
82 82
 msgstr ""
83 83
 
84
-#: clamav-milter.c:936
84
+#: clamav-milter.c:941
85 85
 msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine."
86 86
 msgstr ""
87 87
 
88
-#: clamav-milter.c:937
88
+#: clamav-milter.c:942
89 89
 msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."
90 90
 msgstr ""
91 91
 
92
-#: clamav-milter.c:938
92
+#: clamav-milter.c:943
93 93
 msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."
94 94
 msgstr ""
95 95
 
96
-#: clamav-milter.c:939
96
+#: clamav-milter.c:944
97 97
 msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."
98 98
 msgstr ""
99 99
 
100
-#: clamav-milter.c:940
100
+#: clamav-milter.c:945
101 101
 msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."
102 102
 msgstr ""
103 103
 
104
-#: clamav-milter.c:941
104
+#: clamav-milter.c:946
105 105
 msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster."
106 106
 msgstr ""
107 107
 
108
-#: clamav-milter.c:942
108
+#: clamav-milter.c:947
109 109
 msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."
110 110
 msgstr ""
111 111
 
112
-#: clamav-milter.c:943
112
+#: clamav-milter.c:948
113 113
 msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account."
114 114
 msgstr ""
115 115
 
116
-#: clamav-milter.c:944
116
+#: clamav-milter.c:949
117 117
 msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."
118 118
 msgstr ""
119 119
 
120
-#: clamav-milter.c:945
120
+#: clamav-milter.c:950
121 121
 msgid ""
122 122
 "\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running "
123 123
 "clamd (when using TCPsocket)."
124 124
 msgstr ""
125 125
 
126
-#: clamav-milter.c:946
126
+#: clamav-milter.c:951
127 127
 msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."
128 128
 msgstr ""
129 129
 
130
-#: clamav-milter.c:947
130
+#: clamav-milter.c:952
131 131
 msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file."
132 132
 msgstr ""
133 133
 
134
-#: clamav-milter.c:948
134
+#: clamav-milter.c:953
135 135
 msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."
136 136
 msgstr ""
137 137
 
138
-#: clamav-milter.c:949
138
+#: clamav-milter.c:954
139 139
 msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die."
140 140
 msgstr ""
141 141
 
142
-#: clamav-milter.c:950
142
+#: clamav-milter.c:955
143 143
 msgid "\t--version\t\t-V\tPrint the version number of this software."
144 144
 msgstr ""
145 145
 
146
-#: clamav-milter.c:952
146
+#: clamav-milter.c:957
147 147
 msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'."
148 148
 msgstr ""
149 149
 
150
-#: clamav-milter.c:954
150
+#: clamav-milter.c:959
151 151
 msgid ""
152 152
 "\n"
153 153
 "For more information type \"man clamav-milter\"."
154 154
 msgstr ""
155 155
 
156
-#: clamav-milter.c:955
156
+#: clamav-milter.c:960
157 157
 msgid "Report bugs to bugs@clamav.net."
158 158
 msgstr ""
159 159
 
160
-#: clamav-milter.c:1247
160
+#: clamav-milter.c:1252
161 161
 #, c-format
162 162
 msgid "%s: No socket-addr given\n"
163 163
 msgstr ""
164 164
 
165
-#: clamav-milter.c:1256
165
+#: clamav-milter.c:1261
166 166
 #, c-format
167 167
 msgid "%s: Can't parse the config file %s\n"
168 168
 msgstr ""
169 169
 
170
-#: clamav-milter.c:1295
170
+#: clamav-milter.c:1300
171 171
 #, c-format
172 172
 msgid ""
173 173
 "%s: The iface option to --broadcast is not supported on your operating "
174 174
 "system\n"
175 175
 msgstr ""
176 176
 
177
-#: clamav-milter.c:1304
177
+#: clamav-milter.c:1309
178 178
 #, c-format
179 179
 msgid "%s: Can't get information about user %s\n"
180 180
 msgstr ""
181 181
 
182
-#: clamav-milter.c:1315
182
+#: clamav-milter.c:1320
183 183
 #, c-format
184 184
 msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n"
185 185
 msgstr ""
186 186
 
187
-#: clamav-milter.c:1332
187
+#: clamav-milter.c:1337
188 188
 #, c-format
189 189
 msgid "Running as user %s (UID %d, GID %d)\n"
190 190
 msgstr ""
191 191
 
192
-#: clamav-milter.c:1335
192
+#: clamav-milter.c:1340
193 193
 #, c-format
194 194
 msgid "%s: running as root is not recommended (check \"User\" in clamd.conf)\n"
195 195
 msgstr ""
196 196
 
197
-#: clamav-milter.c:1337
197
+#: clamav-milter.c:1342
198 198
 #, c-format
199 199
 msgid "%s: Only root can set an interface for --broadcast\n"
200 200
 msgstr ""
201 201
 
202
-#: clamav-milter.c:1342
202
+#: clamav-milter.c:1347
203 203
 #, c-format
204 204
 msgid "%s: Advisory mode doesn't work with quarantine mode\n"
205 205
 msgstr ""
206 206
 
207
-#: clamav-milter.c:1350
207
+#: clamav-milter.c:1355
208 208
 #, c-format
209 209
 msgid "%s: Advisory mode doesn't work with quarantine directories\n"
210 210
 msgstr ""
211 211
 
212
-#: clamav-milter.c:1356
212
+#: clamav-milter.c:1361
213 213
 #, c-format
214 214
 msgid "%s: the quarantine directory must not contain the string 'ERROR'\n"
215 215
 msgstr ""
216 216
 
217
-#: clamav-milter.c:1362
217
+#: clamav-milter.c:1367
218 218
 #, c-format
219 219
 msgid "%s: the quarantine directory must not contain the string 'FOUND'\n"
220 220
 msgstr ""
221 221
 
222
-#: clamav-milter.c:1368
222
+#: clamav-milter.c:1373
223 223
 #, c-format
224 224
 msgid "%s: the quarantine directory must not contain the string 'OK'\n"
225 225
 msgstr ""
226 226
 
227
-#: clamav-milter.c:1385
227
+#: clamav-milter.c:1390
228 228
 #, c-format
229 229
 msgid "%s: insecure quarantine directory %s (mode 0%o)\n"
230 230
 msgstr ""
231 231
 
232
-#: clamav-milter.c:1411
232
+#: clamav-milter.c:1416
233 233
 #, c-format
234 234
 msgid "%s: ReadTimeout must not be negative in %s\n"
235 235
 msgstr ""
236 236
 
237
-#: clamav-milter.c:1419
237
+#: clamav-milter.c:1424
238 238
 #, c-format
239 239
 msgid "%s: StreamMaxLength must not be negative in %s\n"
240 240
 msgstr ""
241 241
 
242
-#: clamav-milter.c:1442
242
+#: clamav-milter.c:1447
243 243
 #, c-format
244 244
 msgid ""
245 245
 "%s: (-q && !LogSyslog): warning - all interception message methods are off\n"
246 246
 msgstr ""
247 247
 
248
-#: clamav-milter.c:1452
248
+#: clamav-milter.c:1457
249 249
 #, c-format
250 250
 msgid "%s: ScanMail not defined in %s (needed with --internal)\n"
251 251
 msgstr ""
252 252
 
253
-#: clamav-milter.c:1457
253
+#: clamav-milter.c:1462
254 254
 #, c-format
255 255
 msgid "%s: --max-children must be given in internal mode\n"
256 256
 msgstr ""
257 257
 
258
-#: clamav-milter.c:1461
258
+#: clamav-milter.c:1466
259 259
 #, c-format
260 260
 msgid "%s: --timeout must not be given in internal mode\n"
261 261
 msgstr ""
262 262
 
263
-#: clamav-milter.c:1474
263
+#: clamav-milter.c:1479
264 264
 #, c-format
265 265
 msgid "%s: You can select one server type only (local/TCP) in %s\n"
266 266
 msgstr ""
267 267
 
268
-#: clamav-milter.c:1484
268
+#: clamav-milter.c:1489
269 269
 #, c-format
270 270
 msgid "The connection from sendmail to %s (%s) must not\n"
271 271
 msgstr ""
272 272
 
273
-#: clamav-milter.c:1486
273
+#: clamav-milter.c:1491
274 274
 #, c-format
275 275
 msgid "be the same as the connection to clamd (%s) in %s\n"
276 276
 msgstr ""
277 277
 
278
-#: clamav-milter.c:1496 clamav-milter.c:1519
278
+#: clamav-milter.c:1501 clamav-milter.c:1524
279 279
 #, c-format
280 280
 msgid "Can't talk to clamd server via %s\n"
281 281
 msgstr ""
282 282
 
283
-#: clamav-milter.c:1498 clamav-milter.c:1521
283
+#: clamav-milter.c:1503 clamav-milter.c:1526
284 284
 #, c-format
285 285
 msgid "Check your entry for LocalSocket in %s\n"
286 286
 msgstr ""
287 287
 
288
-#: clamav-milter.c:1532
288
+#: clamav-milter.c:1537
289 289
 msgid "Can't create a clamd session"
290 290
 msgstr ""
291 291
 
292
-#: clamav-milter.c:1549
292
+#: clamav-milter.c:1554
293 293
 #, c-format
294 294
 msgid ""
295 295
 "%s: --quarantine-dir not supported for remote scanning - use --quarantine\n"
296 296
 msgstr ""
297 297
 
298
-#: clamav-milter.c:1564
298
+#: clamav-milter.c:1569
299 299
 #, c-format
300 300
 msgid "%s: hostname %s is longer than %d characters\n"
301 301
 msgstr ""
302 302
 
303
-#: clamav-milter.c:1583 clamav-milter.c:1666
303
+#: clamav-milter.c:1588 clamav-milter.c:1671
304 304
 #, c-format
305 305
 msgid "%s: --max-children must be given in sessions mode\n"
306 306
 msgstr ""
307 307
 
308
-#: clamav-milter.c:1606
308
+#: clamav-milter.c:1611
309 309
 #, c-format
310 310
 msgid "%s: Unknown host %s\n"
311 311
 msgstr ""
312 312
 
313
-#: clamav-milter.c:1618
313
+#: clamav-milter.c:1623
314 314
 #, c-format
315 315
 msgid "Can't talk to clamd server %s on port %d\n"
316 316
 msgstr ""
317 317
 
318
-#: clamav-milter.c:1635
318
+#: clamav-milter.c:1640
319 319
 msgid "Can't find any active clamd servers\n"
320 320
 msgstr ""
321 321
 
322
-#: clamav-milter.c:1636 clamav-milter.c:1642
322
+#: clamav-milter.c:1641 clamav-milter.c:1647
323 323
 #, c-format
324 324
 msgid "Check your entry for TCPSocket in %s\n"
325 325
 msgstr ""
326 326
 
327
-#: clamav-milter.c:1641
327
+#: clamav-milter.c:1646
328 328
 msgid "Can't find any clamd servers\n"
329 329
 msgstr ""
330 330
 
331
-#: clamav-milter.c:1648
331
+#: clamav-milter.c:1653
332 332
 #, c-format
333 333
 msgid "%s: You must select server type (local/TCP) in %s\n"
334 334
 msgstr ""
335 335
 
336
-#: clamav-milter.c:1709
336
+#: clamav-milter.c:1714
337 337
 #, c-format
338 338
 msgid "When debugging it is recommended that you use Foreground mode in %s\n"
339 339
 msgstr ""
340 340
 
341
-#: clamav-milter.c:1710
341
+#: clamav-milter.c:1715
342 342
 msgid "\tso that you can see all of the messages"
343 343
 msgstr ""
344 344
 
345
-#: clamav-milter.c:1811
345
+#: clamav-milter.c:1817
346 346
 msgid "Starting clamav-milter"
347 347
 msgstr ""
348 348
 
349
-#: clamav-milter.c:1820
349
+#: clamav-milter.c:1826
350 350
 #, c-format
351 351
 msgid "Can't save PID in file %s"
352 352
 msgstr ""
353 353
 
354
-#: clamav-milter.c:1822
354
+#: clamav-milter.c:1828
355 355
 #, c-format
356 356
 msgid "Can't save PID in file %s\n"
357 357
 msgstr ""
358 358
 
359
-#: clamav-milter.c:1855
359
+#: clamav-milter.c:1861
360 360
 #, c-format
361 361
 msgid "%s: smfi_setconn failed\n"
362 362
 msgstr ""
363 363
 
364
-#: clamav-milter.c:1871
364
+#: clamav-milter.c:1877
365 365
 #, c-format
366 366
 msgid "Starting %s"
367 367
 msgstr ""
368 368
 
369
-#: clamav-milter.c:1874
369
+#: clamav-milter.c:1880
370 370
 msgid "Debugging is on"
371 371
 msgstr ""
372 372
 
373
-#: clamav-milter.c:1939 clamav-milter.c:2196
373
+#: clamav-milter.c:1945 clamav-milter.c:2202
374 374
 #, c-format
375 375
 msgid "Check clamd server %s - it may be down\n"
376 376
 msgstr ""
377 377
 
378
-#: clamav-milter.c:1944
378
+#: clamav-milter.c:1950
379 379
 msgid "Check clamd server - it may be down"
380 380
 msgstr ""
381 381
 
382
-#: clamav-milter.c:2119
382
+#: clamav-milter.c:2125
383 383
 msgid "No free clamd sessions\n"
384 384
 msgstr ""
385 385
 
386
-#: clamav-milter.c:2199
386
+#: clamav-milter.c:2205
387 387
 #, c-format
388 388
 msgid "Check clamd server %s - it may be down"
389 389
 msgstr ""
390 390
 
391
-#: clamav-milter.c:2205
391
+#: clamav-milter.c:2211
392 392
 msgid "Check clamd server - it may be down\n"
393 393
 msgstr ""
394 394
 
395
-#: clamav-milter.c:2241
395
+#: clamav-milter.c:2247
396 396
 msgid "findServer: select failed"
397 397
 msgstr ""
398 398
 
399
-#: clamav-milter.c:2250
399
+#: clamav-milter.c:2256
400 400
 #, c-format
401 401
 msgid "findServer: using server %d\n"
402 402
 msgstr ""
403 403
 
404
-#: clamav-milter.c:2255
404
+#: clamav-milter.c:2261
405 405
 msgid "findServer: No response from any server\n"
406 406
 msgstr ""
407 407
 
408
-#: clamav-milter.c:2257
408
+#: clamav-milter.c:2263
409 409
 msgid "findServer: No response from any server"
410 410
 msgstr ""
411 411
 
412
-#: clamav-milter.c:2278
412
+#: clamav-milter.c:2284
413 413
 msgid "clamfi_connect: ctx is null"
414 414
 msgstr ""
415 415
 
416
-#: clamav-milter.c:2283
416
+#: clamav-milter.c:2289
417 417
 msgid "clamfi_connect: hostname is null"
418 418
 msgstr ""
419 419
 
420
-#: clamav-milter.c:2304
420
+#: clamav-milter.c:2310
421 421
 msgid "clamfi_connect: remoteIP is null"
422 422
 msgstr ""
423 423
 
424
-#: clamav-milter.c:2313
424
+#: clamav-milter.c:2319
425 425
 #, c-format
426 426
 msgid "clamfi_connect: connection from %s"
427 427
 msgstr ""
428 428
 
429
-#: clamav-milter.c:2314
429
+#: clamav-milter.c:2320
430 430
 #, c-format
431 431
 msgid "clamfi_connect: connection from %s\n"
432 432
 msgstr ""
433 433
 
434
-#: clamav-milter.c:2317
434
+#: clamav-milter.c:2323
435 435
 #, c-format
436 436
 msgid "clamfi_connect: connection from %s [%s]"
437 437
 msgstr ""
438 438
 
439
-#: clamav-milter.c:2318
439
+#: clamav-milter.c:2324
440 440
 #, c-format
441 441
 msgid "clamfi_connect: connection from %s [%s]\n"
442 442
 msgstr ""
443 443
 
444
-#: clamav-milter.c:2338
444
+#: clamav-milter.c:2344
445 445
 msgid "Can't get sendmail hostname"
446 446
 msgstr ""
447 447
 
448
-#: clamav-milter.c:2347
448
+#: clamav-milter.c:2353
449 449
 #, c-format
450 450
 msgid "Access Denied: Host Unknown (%s)"
451 451
 msgstr ""
452 452
 
453
-#: clamav-milter.c:2356
453
+#: clamav-milter.c:2362
454 454
 #, c-format
455 455
 msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n"
456 456
 msgstr ""
457 457
 
458
-#: clamav-milter.c:2367
458
+#: clamav-milter.c:2373
459 459
 #, c-format
460 460
 msgid "Access Denied: Can't get IP address for (%s)"
461 461
 msgstr ""
462 462
 
463
-#: clamav-milter.c:2384
463
+#: clamav-milter.c:2390
464 464
 #, c-format
465 465
 msgid "Access Denied for %s[%s]"
466 466
 msgstr ""
467 467
 
468
-#: clamav-milter.c:2402
468
+#: clamav-milter.c:2408
469 469
 msgid "clamfi_connect: not scanning outgoing messages"
470 470
 msgstr ""
471 471
 
472
-#: clamav-milter.c:2403
472
+#: clamav-milter.c:2409
473 473
 msgid "clamfi_connect: not scanning outgoing messages\n"
474 474
 msgstr ""
475 475
 
476
-#: clamav-milter.c:2411
476
+#: clamav-milter.c:2417
477 477
 msgid "clamfi_connect: not scanning local messages"
478 478
 msgstr ""
479 479
 
480
-#: clamav-milter.c:2412
480
+#: clamav-milter.c:2418
481 481
 msgid "clamfi_connect: not scanning local messages\n"
482 482
 msgstr ""
483 483
 
484
-#: clamav-milter.c:2444
484
+#: clamav-milter.c:2450
485 485
 #, c-format
486 486
 msgid "hit max-children limit (%u >= %u)\n"
487 487
 msgstr ""
488 488
 
489
-#: clamav-milter.c:2445
489
+#: clamav-milter.c:2451
490 490
 #, c-format
491 491
 msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"
492 492
 msgstr ""
493 493
 
494
-#: clamav-milter.c:2451
494
+#: clamav-milter.c:2457
495 495
 #, c-format
496 496
 msgid "hit max-children limit (%u >= %u)"
497 497
 msgstr ""
498 498
 
499
-#: clamav-milter.c:2452
499
+#: clamav-milter.c:2458
500 500
 #, c-format
501 501
 msgid "hit max-children limit (%u >= %u): waiting for some to exit"
502 502
 msgstr ""
503 503
 
504
-#: clamav-milter.c:2457
504
+#: clamav-milter.c:2463
505 505
 msgid "AV system temporarily overloaded - please try later"
506 506
 msgstr ""
507 507
 
508
-#: clamav-milter.c:2490
508
+#: clamav-milter.c:2496
509 509
 #, c-format
510 510
 msgid ">n_children = %d\n"
511 511
 msgstr ""
512 512
 
513
-#: clamav-milter.c:2496
513
+#: clamav-milter.c:2502
514 514
 msgid "Timeout waiting for a child to die"
515 515
 msgstr ""
516 516
 
517
-#: clamav-milter.c:2498
517
+#: clamav-milter.c:2504
518 518
 msgid "Timeout waiting for a child to die\n"
519 519
 msgstr ""
520 520
 
521
-#: clamav-milter.c:2608
521
+#: clamav-milter.c:2614
522 522
 #, c-format
523 523
 msgid "Failed to delete X-Virus-Status header %d"
524 524
 msgstr ""
525 525
 
526
-#: clamav-milter.c:2636
526
+#: clamav-milter.c:2642
527 527
 msgid "clamfi_eoh"
528 528
 msgstr ""
529 529
 
530
-#: clamav-milter.c:2639
530
+#: clamav-milter.c:2645
531 531
 msgid "clamfi_eoh\n"
532 532
 msgstr ""
533 533
 
534
-#: clamav-milter.c:2696
534
+#: clamav-milter.c:2702
535 535
 msgid "clamfi_eoh: ignoring whitelisted message"
536 536
 msgstr ""
537 537
 
538
-#: clamav-milter.c:2698
538
+#: clamav-milter.c:2704
539 539
 msgid "clamfi_eoh: ignoring whitelisted message\n"
540 540
 msgstr ""
541 541
 
542
-#: clamav-milter.c:2712
542
+#: clamav-milter.c:2718
543 543
 #, c-format
544 544
 msgid "clamfi_envbody: %u bytes"
545 545
 msgstr ""
546 546
 
547
-#: clamav-milter.c:2714
547
+#: clamav-milter.c:2720
548 548
 #, c-format
549 549
 msgid "clamfi_envbody: %u bytes\n"
550 550
 msgstr ""
551 551
 
552
-#: clamav-milter.c:2724 clamav-milter.c:2986
552
+#: clamav-milter.c:2730 clamav-milter.c:2992
553 553
 #, c-format
554 554
 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"
555 555
 msgstr ""
556 556
 
557
-#: clamav-milter.c:2728 clamav-milter.c:2989
557
+#: clamav-milter.c:2734 clamav-milter.c:2995
558 558
 msgid "Not Scanned - StreamMaxLength exceeded"
559 559
 msgstr ""
560 560
 
561
-#: clamav-milter.c:2826
561
+#: clamav-milter.c:2832
562 562
 #, c-format
563 563
 msgid "failed to send SCAN %s command to clamd"
564 564
 msgstr ""
565 565
 
566
-#: clamav-milter.c:2848
566
+#: clamav-milter.c:2854
567 567
 msgid "failed to send SCAN command to clamd"
568 568
 msgstr ""
569 569
 
570
-#: clamav-milter.c:2864
570
+#: clamav-milter.c:2870
571 571
 #, c-format
572 572
 msgid "Wating to read status from fd %d\n"
573 573
 msgstr ""
574 574
 
575
-#: clamav-milter.c:2875
575
+#: clamav-milter.c:2881
576 576
 #, c-format
577 577
 msgid "clamfi_eom: read %s"
578 578
 msgstr ""
579 579
 
580
-#: clamav-milter.c:2876
580
+#: clamav-milter.c:2882
581 581
 #, c-format
582 582
 msgid "clamfi_eom: read %s\n"
583 583
 msgstr ""
584 584
 
585
-#: clamav-milter.c:2884
585
+#: clamav-milter.c:2890
586 586
 msgid "clamfi_eom: read nothing from clamd"
587 587
 msgstr ""
588 588
 
589
-#: clamav-milter.c:2886
589
+#: clamav-milter.c:2892
590 590
 msgid "clamfi_eom: read nothing from clamd\n"
591 591
 msgstr ""
592 592
 
593
-#: clamav-milter.c:2931 clamav-milter.c:2975
593
+#: clamav-milter.c:2937 clamav-milter.c:2981
594 594
 msgid "Error determining host"
595 595
 msgstr ""
596 596
 
597
-#: clamav-milter.c:2994
597
+#: clamav-milter.c:3000
598 598
 msgid "Not Scanned"
599 599
 msgstr ""
600 600
 
601
-#: clamav-milter.c:3021
601
+#: clamav-milter.c:3027
602 602
 msgid "Infected"
603 603
 msgstr ""
604 604
 
605
-#: clamav-milter.c:3040
605
+#: clamav-milter.c:3046
606 606
 #, c-format
607 607
 msgid "Intercepted virus from %s to"
608 608
 msgstr ""
609 609
 
610
-#: clamav-milter.c:3137
610
+#: clamav-milter.c:3143
611 611
 msgid ""
612 612
 "Subject: Virus intercepted\n"
613 613
 "\n"
614 614
 msgstr ""
615 615
 
616
-#: clamav-milter.c:3159
616
+#: clamav-milter.c:3165
617 617
 msgid "A message you sent to\n"
618 618
 msgstr ""
619 619
 
620
-#: clamav-milter.c:3166
620
+#: clamav-milter.c:3172
621 621
 #, c-format
622 622
 msgid "The message %1$s sent from %2$s to\n"
623 623
 msgstr ""
624 624
 
625
-#: clamav-milter.c:3169
625
+#: clamav-milter.c:3175
626 626
 #, c-format
627 627
 msgid "A message sent from %s to\n"
628 628
 msgstr ""
629 629
 
630
-#: clamav-milter.c:3174
630
+#: clamav-milter.c:3180
631 631
 #, c-format
632 632
 msgid "contained %s and has not been delivered.\n"
633 633
 msgstr ""
634 634
 
635
-#: clamav-milter.c:3177
635
+#: clamav-milter.c:3183
636 636
 #, c-format
637 637
 msgid ""
638 638
 "\n"
639 639
 "The message in question has been quarantined as %s\n"
640 640
 msgstr ""
641 641
 
642
-#: clamav-milter.c:3180
642
+#: clamav-milter.c:3186
643 643
 #, c-format
644 644
 msgid ""
645 645
 "\n"
... ...
@@ -647,13 +647,13 @@ msgid ""
647 647
 "\n"
648 648
 msgstr ""
649 649
 
650
-#: clamav-milter.c:3183
650
+#: clamav-milter.c:3189
651 651
 msgid ""
652 652
 "For your information, the original message headers were:\n"
653 653
 "\n"
654 654
 msgstr ""
655 655
 
656
-#: clamav-milter.c:3196
656
+#: clamav-milter.c:3202
657 657
 #, c-format
658 658
 msgid ""
659 659
 "\n"
... ...
@@ -661,234 +661,234 @@ msgid ""
661 661
 "%s\t\n"
662 662
 msgstr ""
663 663
 
664
-#: clamav-milter.c:3207
664
+#: clamav-milter.c:3213
665 665
 #, c-format
666 666
 msgid "Quarantined infected mail as %s"
667 667
 msgstr ""
668 668
 
669
-#: clamav-milter.c:3231
669
+#: clamav-milter.c:3237
670 670
 #, c-format
671 671
 msgid "Can't set quarantine user %s"
672 672
 msgstr ""
673 673
 
674
-#: clamav-milter.c:3233
674
+#: clamav-milter.c:3239
675 675
 #, c-format
676 676
 msgid "Can't set quarantine user %s\n"
677 677
 msgstr ""
678 678
 
679
-#: clamav-milter.c:3246
679
+#: clamav-milter.c:3252
680 680
 #, c-format
681 681
 msgid "virus %s detected by ClamAV - http://www.clamav.net"
682 682
 msgstr ""
683 683
 
684
-#: clamav-milter.c:3251
684
+#: clamav-milter.c:3257
685 685
 msgid "Unknown"
686 686
 msgstr ""
687 687
 
688
-#: clamav-milter.c:3253
688
+#: clamav-milter.c:3259
689 689
 #, c-format
690 690
 msgid "%s: incorrect message \"%s\" from clamd"
691 691
 msgstr ""
692 692
 
693
-#: clamav-milter.c:3259
693
+#: clamav-milter.c:3265
694 694
 msgid "Clean"
695 695
 msgstr ""
696 696
 
697
-#: clamav-milter.c:3263
697
+#: clamav-milter.c:3269
698 698
 #, c-format
699 699
 msgid "%s: clean message from %s"
700 700
 msgstr ""
701 701
 
702
-#: clamav-milter.c:3265
702
+#: clamav-milter.c:3271
703 703
 msgid "an unknown sender"
704 704
 msgstr ""
705 705
 
706
-#: clamav-milter.c:3369
706
+#: clamav-milter.c:3375
707 707
 #, c-format
708 708
 msgid "Can't remove clean file %s"
709 709
 msgstr ""
710 710
 
711
-#: clamav-milter.c:3550 clamav-milter.c:3553
711
+#: clamav-milter.c:3556 clamav-milter.c:3559
712 712
 #, c-format
713 713
 msgid "write failure (%u bytes) to %s: %s"
714 714
 msgstr ""
715 715
 
716
-#: clamav-milter.c:3567 clamav-milter.c:3570
716
+#: clamav-milter.c:3573 clamav-milter.c:3576
717 717
 #, c-format
718 718
 msgid "write failure (%u bytes) to clamd: %s"
719 719
 msgstr ""
720 720
 
721
-#: clamav-milter.c:3636
721
+#: clamav-milter.c:3642
722 722
 #, c-format
723 723
 msgid "No data received from clamd in %d seconds\n"
724 724
 msgstr ""
725 725
 
726
-#: clamav-milter.c:3658
726
+#: clamav-milter.c:3664
727 727
 #, c-format
728 728
 msgid "Can't stat %s"
729 729
 msgstr ""
730 730
 
731
-#: clamav-milter.c:3669 clamav-milter.c:4092
731
+#: clamav-milter.c:3675 clamav-milter.c:4098
732 732
 #, c-format
733 733
 msgid "Can't open %s"
734 734
 msgstr ""
735 735
 
736
-#: clamav-milter.c:3785 clamav-milter.c:4257
736
+#: clamav-milter.c:3791 clamav-milter.c:4263
737 737
 #, c-format
738 738
 msgid "mkdir %s failed"
739 739
 msgstr ""
740 740
 
741
-#: clamav-milter.c:3797
741
+#: clamav-milter.c:3803
742 742
 #, c-format
743 743
 msgid "mktemp %s failed"
744 744
 msgstr ""
745 745
 
746
-#: clamav-milter.c:3807
746
+#: clamav-milter.c:3813
747 747
 #, c-format
748 748
 msgid "Temporary quarantine file %s creation failed"
749 749
 msgstr ""
750 750
 
751
-#: clamav-milter.c:3911
751
+#: clamav-milter.c:3917
752 752
 #, c-format
753 753
 msgid "failed to send STREAM command clamd server %d"
754 754
 msgstr ""
755 755
 
756
-#: clamav-milter.c:3920
756
+#: clamav-milter.c:3926
757 757
 msgid "failed to send STREAM command clamd"
758 758
 msgstr ""
759 759
 
760
-#: clamav-milter.c:3932
760
+#: clamav-milter.c:3938
761 761
 msgid "failed to create TCPSocket to talk to clamd"
762 762
 msgstr ""
763 763
 
764
-#: clamav-milter.c:3944 clamav-milter.c:3960
764
+#: clamav-milter.c:3950 clamav-milter.c:3966
765 765
 msgid "recv failed from clamd getting PORT"
766 766
 msgstr ""
767 767
 
768
-#: clamav-milter.c:3948 clamav-milter.c:3962
768
+#: clamav-milter.c:3954 clamav-milter.c:3968
769 769
 msgid "EOF from clamd getting PORT"
770 770
 msgstr ""
771 771
 
772
-#: clamav-milter.c:3973
772
+#: clamav-milter.c:3979
773 773
 #, c-format
774 774
 msgid "Expected port information from clamd, got '%s'"
775 775
 msgstr ""
776 776
 
777
-#: clamav-milter.c:3976
777
+#: clamav-milter.c:3982
778 778
 #, c-format
779 779
 msgid "Expected port information from clamd, got '%s'\n"
780 780
 msgstr ""
781 781
 
782
-#: clamav-milter.c:3996 clamav-milter.c:3999
782
+#: clamav-milter.c:4002 clamav-milter.c:4005
783 783
 #, c-format
784 784
 msgid "Connecting to local port %d - data %d cmd %d\n"
785 785
 msgstr ""
786 786
 
787
-#: clamav-milter.c:4014 clamav-milter.c:4017
787
+#: clamav-milter.c:4020 clamav-milter.c:4023
788 788
 #, c-format
789 789
 msgid "Failed to connect to port %d given by clamd: %s"
790 790
 msgstr ""
791 791
 
792
-#: clamav-milter.c:4104
792
+#: clamav-milter.c:4110
793 793
 #, c-format
794 794
 msgid "Clamd (pid %d) seems to have died"
795 795
 msgstr ""
796 796
 
797
-#: clamav-milter.c:4130
797
+#: clamav-milter.c:4136
798 798
 #, c-format
799 799
 msgid "Can't open e-mail template file %s"
800 800
 msgstr ""
801 801
 
802
-#: clamav-milter.c:4139
802
+#: clamav-milter.c:4145
803 803
 #, c-format
804 804
 msgid "Can't stat e-mail template file %s"
805 805
 msgstr ""
806 806
 
807
-#: clamav-milter.c:4148
807
+#: clamav-milter.c:4154
808 808
 msgid "Out of memory"
809 809
 msgstr ""
810 810
 
811
-#: clamav-milter.c:4175
811
+#: clamav-milter.c:4181
812 812
 #, c-format
813 813
 msgid "%s: Unknown clamAV variable \"%c\"\n"
814 814
 msgstr ""
815 815
 
816
-#: clamav-milter.c:4186
816
+#: clamav-milter.c:4192
817 817
 #, c-format
818 818
 msgid "%s: Unterminated sendmail variable \"%s\"\n"
819 819
 msgstr ""
820 820
 
821
-#: clamav-milter.c:4197
821
+#: clamav-milter.c:4203
822 822
 #, c-format
823 823
 msgid "%s: Unknown sendmail variable \"%s\"\n"
824 824
 msgstr ""
825 825
 
826
-#: clamav-milter.c:4284
826
+#: clamav-milter.c:4290
827 827
 #, c-format
828 828
 msgid "Can't rename %1$s to %2$s"
829 829
 msgstr ""
830 830
 
831
-#: clamav-milter.c:4293
831
+#: clamav-milter.c:4299
832 832
 #, c-format
833 833
 msgid "File quarantined as %s"
834 834
 msgstr ""
835 835
 
836
-#: clamav-milter.c:4385
836
+#: clamav-milter.c:4391
837 837
 #, c-format
838 838
 msgid "[Virus] %s"
839 839
 msgstr ""
840 840
 
841
-#: clamav-milter.c:4479
841
+#: clamav-milter.c:4485
842 842
 msgid ""
843 843
 "No response from any clamd server - your AV system is not scanning emails\n"
844 844
 msgstr ""
845 845
 
846
-#: clamav-milter.c:4482
846
+#: clamav-milter.c:4488
847 847
 msgid ""
848 848
 "No response from any clamd server - your AV system is not scanning emails"
849 849
 msgstr ""
850 850
 
851
-#: clamav-milter.c:4500
851
+#: clamav-milter.c:4506
852 852
 msgid "Subject: ClamAV Down\n"
853 853
 msgstr ""
854 854
 
855
-#: clamav-milter.c:4503
855
+#: clamav-milter.c:4509
856 856
 msgid ""
857 857
 "This is an automatic message\n"
858 858
 "\n"
859 859
 msgstr ""
860 860
 
861
-#: clamav-milter.c:4506
861
+#: clamav-milter.c:4512
862 862
 msgid "The clamd program cannot be contacted.\n"
863 863
 msgstr ""
864 864
 
865
-#: clamav-milter.c:4508
865
+#: clamav-milter.c:4514
866 866
 msgid "No clamd server can be contacted.\n"
867 867
 msgstr ""
868 868
 
869
-#: clamav-milter.c:4510
869
+#: clamav-milter.c:4516
870 870
 msgid "Emails may not be being scanned, please check your servers.\n"
871 871
 msgstr ""
872 872
 
873
-#: clamav-milter.c:4579
873
+#: clamav-milter.c:4585
874 874
 msgid "Loading new database"
875 875
 msgstr ""
876 876
 
877
-#: clamav-milter.c:4767
877
+#: clamav-milter.c:4773
878 878
 #, c-format
879 879
 msgid "Stopping %s"
880 880
 msgstr ""
881 881
 
882
-#: clamav-milter.c:4811
882
+#: clamav-milter.c:4817
883 883
 msgid "Stopping clamav-milter"
884 884
 msgstr ""
885 885
 
886
-#: clamav-milter.c:4919
886
+#: clamav-milter.c:4925
887 887
 #, c-format
888 888
 msgid "ClamAV: Protecting against %u viruses"
889 889
 msgstr ""
890 890
 
891
-#: clamav-milter.c:4924
891
+#: clamav-milter.c:4930
892 892
 #, c-format
893 893
 msgid "Loaded %s"
894 894
 msgstr ""