1. clamav-devel
  2. Commit e8a362f9b78e2482a4798f917079df96336bfaf3
Browse code

Added --template-headers

git-svn: trunk@1840

Nigel Horne authored on 2006/02/05 23:02:24
Showing 4 changed files
clamav-devel/ChangeLog
History View file @ e8a362f
... ... 
@@ -1,3 +1,10 @@
1 
+Sun Feb  5 13:56:56 GMT 2006 (njh)
2 
+----------------------------------
3 
+  * clamav-milter:	Added --template-headers option, based on a whishlist
4 
+				by Denis Eremenko <moonshade*mail.kz> for
5 
+				the support of foreign language and HTML
6 
+				emails in --template-file
7 
+
1 8 
 Sun Feb  5 13:29:42 GMT 2006 (njh)
2 9 
 ----------------------------------
3 10 
   * clamav-milter:	Correct the error message if the given whitelistFile
clamav-devel/clamav-milter/clamav-milter.c
History View file @ e8a362f
... ... 
@@ -22,7 +22,7 @@
22 22 
  *
23 23 
  * For installation instructions see the file INSTALL that came with this file
24 24 
  */
25 
-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.230 2006/02/05 13:33:35 nigelhorne Exp $";
25 
+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.231 2006/02/05 14:02:24 nigelhorne Exp $";
26 26
27 27 
 #define	CM_VERSION	"devel-050206"
28 28
... ... 
@@ -365,7 +365,8 @@ static	int	logClean = 1;	/*
365 365 
 				 */
366 366 
 static	char	*signature = N_("-- \nScanned by ClamAv - http://www.clamav.net\n");
367 367 
 static	time_t	signatureStamp;
368 
-static	char	*templatefile;	/* e-mail to be sent when virus detected */
368 
+static	char	*templateFile;	/* e-mail to be sent when virus detected */
369 
+static	char	*templateHeaders;	/* headers to be added to the above */
369 370 
 static	const char	*tmpdir;
370 371
371 372 
 #ifdef	CL_DEBUG
... ... 
@@ -505,6 +506,7 @@ help(void)
505 505 
 	puts(_("\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."));
506 506 
 	puts(_("\t--signature-file=FILE\t-F FILE\tLocation of signature file."));
507 507 
 	puts(_("\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."));
508 
+	puts(_("\t--template-headers=FILE\t\tLocation of e-mail headers for template file."));
508 509 
 	puts(_("\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die."));
509 510 
 	puts(_("\t--whitelist-file=FILE\t-W FILE\tLocation of the file of whitelisted addresses"));
510 511 
 	puts(_("\t--version\t\t-V\tPrint the version number of this software."));
... ... 
@@ -677,6 +679,9 @@ main(int argc, char **argv)
677 677 
 				"template-file", 1, NULL, 't'
678 678 
 			},
679 679 
 			{
680 
+				"template-headers", 1, NULL, '1'
681 
+			},
682 
+			{
680 683 
 				"timeout", 1, NULL, 'T'
681 684 
 			},
682 685 
 			{
... ... 
@@ -802,7 +807,10 @@ main(int argc, char **argv)
802 802 
 				Sflag++;
803 803 
 				break;
804 804 
 			case 't':	/* e-mail template file */
805 
-				templatefile = optarg;
805 
+				templateFile = optarg;
806 
+				break;
807 
+			case '1':	/* headers for the template file */
808 
+				templateHeaders = optarg;
806 809 
 				break;
807 810 
 			case 'T':	/* time to wait for child to die */
808 811 
 				child_timeout = atoi(optarg);
... ... 
@@ -1032,10 +1040,21 @@ main(int argc, char **argv)
1032 1032 
 	if(sigFilename && !updateSigFile())
1033 1033 
 		return EX_USAGE;
1034 1034
1035 
-	if(templatefile && (access(templatefile, R_OK) < 0)) {
1036 
-		perror(templatefile);
1035 
+	if(templateFile && (access(templateFile, R_OK) < 0)) {
1036 
+		perror(templateFile);
1037 1037 
 		return EX_CONFIG;
1038 1038 
 	}
1039 
+	if(templateHeaders) {
1040 
+		if(templateFile == NULL) {
1041 
+			fputs(("%s: --template-headers requires --template-file\n"),
1042 
+				stderr);
1043 
+			return EX_CONFIG;
1044 
+		}
1045 
+		if(access(templateHeaders, R_OK) < 0) {
1046 
+			perror(templateHeaders);
1047 
+			return EX_CONFIG;
1048 
+		}
1049 
+	}
1039 1050 
 	if(whitelistFile && (access(whitelistFile, R_OK) < 0)) {
1040 1051 
 		perror(whitelistFile);
1041 1052 
 		return EX_CONFIG;
... ... 
@@ -3008,10 +3027,36 @@ clamfi_eom(SMFICTX *ctx)
3008 3008 
 					fprintf(sendmail,
3009 3009 
 						"X-Infected-Received-From: %s\n",
3010 3010 
 						ptr);
3011 
-				fputs(_("Subject: Virus intercepted\n\n"), sendmail);
3011 
+				fputs(_("Subject: Virus intercepted\n"), sendmail);
3012 
+
3013 
+				if(templateHeaders) {
3014 
+					/*
3015 
+					 * For example, to state the character
3016 
+					 * set of the message:
3017 
+					 *	Content-Type: text/plain; charset=koi8-r
3018 
+					 *
3019 
+					 * Based on a suggestion by Denis
3020 
+					 *	Eremenko <moonshade@mail.kz>
3021 
+					 */
3022 
+					FILE *fin = fopen(templateHeaders, "r");
3023 
+
3024 
+					if(fin == NULL) {
3025 
+						perror(templateHeaders);
3026 
+						if(use_syslog)
3027 
+							syslog(LOG_ERR, _("Can't open e-mail template header file %s"),
3028 
+								templateHeaders);
3029 
+					} else {
3030 
+						int c;
3031 
+						while((c = getc(fin)) != EOF)
3032 
+							putc(c, sendmail);
3033 
+						fclose(fin);
3034 
+					}
3035 
+				}
3036 
+
3037 
+				fputs(_("\n"), sendmail);
3012 3038
3013 
-				if((templatefile == NULL) ||
3014 
-				   (sendtemplate(ctx, templatefile, sendmail, virusname) < 0)) {
3039 
+				if((templateFile == NULL) ||
3040 
+				   (sendtemplate(ctx, templateFile, sendmail, virusname) < 0)) {
3015 3041 
 					/*
3016 3042 
 					 * Use our own hardcoded template
3017 3043 
 					 */
clamav-devel/clamav-milter/clamav-milter.po
History View file @ e8a362f
... ... 
@@ -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-06-30 10:14+0100\n"
11 
+"POT-Creation-Date: 2006-02-05 13:59+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,727 +16,759 @@ msgstr ""
16 16 
 "Content-Type: text/plain; charset=CHARSET\n"
17 17 
 "Content-Transfer-Encoding: 8bit\n"
18 18
19 
-#: clamav-milter.c:470
19 
+#: clamav-milter.c:478
20 20 
 msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them."
21 21 
 msgstr ""
22 22
23 
-#: clamav-milter.c:471
23 
+#: clamav-milter.c:479
24 24 
 msgid "\t--bounce\t\t-b\tSend a failure message to the sender."
25 25 
 msgstr ""
26 26
27 
-#: clamav-milter.c:472
27 
+#: clamav-milter.c:480
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:473
33 
+#: clamav-milter.c:481
34 34 
 msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE."
35 35 
 msgstr ""
36 36
37 
-#: clamav-milter.c:474
37 
+#: clamav-milter.c:482
38 38 
 msgid "\t--debug\t\t\t-D\tPrint debug messages."
39 39 
 msgstr ""
40 40
41 
-#: clamav-milter.c:475
41 
+#: clamav-milter.c:483
42 42 
 msgid ""
43 43 
 "\t--detect-forged-local-address\t-L\tReject mails that claim to be from us."
44 44 
 msgstr ""
45 45
46 
-#: clamav-milter.c:476
46 
+#: clamav-milter.c:484
47 47 
 msgid ""
48 48 
 "\t--dont-log-clean\t-C\tDon't add an entry to syslog that a mail is clean."
49 49 
 msgstr ""
50 50
51 
-#: clamav-milter.c:477
51 
+#: clamav-milter.c:485
52 52 
 msgid ""
53 53 
 "\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error "
54 54 
 "occurs."
55 55 
 msgstr ""
56 56
57 
-#: clamav-milter.c:478
57 
+#: clamav-milter.c:486
58 58 
 msgid "\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded."
59 59 
 msgstr ""
60 60
61 
-#: clamav-milter.c:479
61 
+#: clamav-milter.c:487
62 62 
 msgid "\t--external\t\t-e\tUse an external scanner (usually clamd)."
63 63 
 msgstr ""
64 64
65 
-#: clamav-milter.c:480
65 
+#: clamav-milter.c:488
66 
+msgid ""
67 
+"\t--freshclam-monitor=SECS\t-M SECS\tHow often to check for database update."
68 
+msgstr ""
69 
+
70 
+#: clamav-milter.c:489
66 71 
 msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."
67 72 
 msgstr ""
68 73
69 
-#: clamav-milter.c:481
74 
+#: clamav-milter.c:490
70 75 
 msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)."
71 76 
 msgstr ""
72 77
73 
-#: clamav-milter.c:482
78 
+#: clamav-milter.c:491
74 79 
 msgid "\t--help\t\t\t-h\tThis message."
75 80 
 msgstr ""
76 81
77 
-#: clamav-milter.c:483
82 
+#: clamav-milter.c:492
78 83 
 msgid "\t--headers\t\t-H\tInclude original message headers in the report."
79 84 
 msgstr ""
80 85
81 
-#: clamav-milter.c:484
86 
+#: clamav-milter.c:493
82 87 
 msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN."
83 88 
 msgstr ""
84 89
85 
-#: clamav-milter.c:485
90 
+#: clamav-milter.c:494
86 91 
 msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans."
87 92 
 msgstr ""
88 93
89 
-#: clamav-milter.c:486
94 
+#: clamav-milter.c:495
90 95 
 msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine."
91 96 
 msgstr ""
92 97
93 
-#: clamav-milter.c:487
98 
+#: clamav-milter.c:496
94 99 
 msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."
95 100 
 msgstr ""
96 101
97 
-#: clamav-milter.c:488
102 
+#: clamav-milter.c:497
98 103 
 msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."
99 104 
 msgstr ""
100 105
101 
-#: clamav-milter.c:489
106 
+#: clamav-milter.c:498
102 107 
 msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."
103 108 
 msgstr ""
104 109
105 
-#: clamav-milter.c:490
110 
+#: clamav-milter.c:499
106 111 
 msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."
107 112 
 msgstr ""
108 113
109 
-#: clamav-milter.c:491
114 
+#: clamav-milter.c:500
110 115 
 msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster."
111 116 
 msgstr ""
112 117
113 
-#: clamav-milter.c:492
118 
+#: clamav-milter.c:501
114 119 
 msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."
115 120 
 msgstr ""
116 121
117 
-#: clamav-milter.c:493
122 
+#: clamav-milter.c:502
118 123 
 msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account."
119 124 
 msgstr ""
120 125
121 
-#: clamav-milter.c:494
126 
+#: clamav-milter.c:503
122 127 
 msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."
123 128 
 msgstr ""
124 129
125 
-#: clamav-milter.c:495
130 
+#: clamav-milter.c:504
126 131 
 msgid ""
127 132 
 "\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running "
128 133 
 "clamd (when using TCPsocket)."
129 134 
 msgstr ""
130 135
131 
-#: clamav-milter.c:496
136 
+#: clamav-milter.c:505
132 137 
 msgid "\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify"
133 138 
 msgstr ""
134 139
135 
-#: clamav-milter.c:497
140 
+#: clamav-milter.c:506
136 141 
 msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."
137 142 
 msgstr ""
138 143
139 
-#: clamav-milter.c:498
144 
+#: clamav-milter.c:507
140 145 
 msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file."
141 146 
 msgstr ""
142 147
143 
-#: clamav-milter.c:499
148 
+#: clamav-milter.c:508
144 149 
 msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."
145 150 
 msgstr ""
146 151
147 
-#: clamav-milter.c:500
152 
+#: clamav-milter.c:509
153 
+msgid ""
154 
+"\t--template-headers=FILE\tLocation of e-mail headers for template file."
155 
+msgstr ""
156 
+
157 
+#: clamav-milter.c:510
148 158 
 msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die."
149 159 
 msgstr ""
150 160
151 
-#: clamav-milter.c:501
161 
+#: clamav-milter.c:511
152 162 
 msgid ""
153 163 
 "\t--whitelist-file=FILE\t-W FILE\tLocation of the file of whitelisted "
154 164 
 "addresses"
155 165 
 msgstr ""
156 166
157 
-#: clamav-milter.c:502
167 
+#: clamav-milter.c:512
158 168 
 msgid "\t--version\t\t-V\tPrint the version number of this software."
159 169 
 msgstr ""
160 170
161 
-#: clamav-milter.c:504
171 
+#: clamav-milter.c:514
162 172 
 msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'."
163 173 
 msgstr ""
164 174
165 
-#: clamav-milter.c:506
175 
+#: clamav-milter.c:516
166 176 
 msgid ""
167 177 
 "\n"
168 178 
 "For more information type \"man clamav-milter\"."
169 179 
 msgstr ""
170 180
171 
-#: clamav-milter.c:507
181 
+#: clamav-milter.c:517
172 182 
 msgid "Report bugs to bugs@clamav.net."
173 183 
 msgstr ""
174 184
175 
-#: clamav-milter.c:830
185 
+#: clamav-milter.c:852
176 186 
 #, c-format
177 187 
 msgid "%s: No socket-addr given\n"
178 188 
 msgstr ""
179 189
180 
-#: clamav-milter.c:836
190 
+#: clamav-milter.c:858
181 191 
 #, c-format
182 192 
 msgid "%s: socket-addr (%s) doesn't agree with sendmail.cf\n"
183 193 
 msgstr ""
184 194
185 
-#: clamav-milter.c:851
195 
+#: clamav-milter.c:873
186 196 
 #, c-format
187 197 
 msgid "%s: when using inet: connection to sendmail you must enable --local\n"
188 198 
 msgstr ""
189 199
190 
-#: clamav-milter.c:863
200 
+#: clamav-milter.c:885
191 201 
 #, c-format
192 202 
 msgid "%s: Can't parse the config file %s\n"
193 203 
 msgstr ""
194 204
195 
-#: clamav-milter.c:870
205 
+#: clamav-milter.c:892
196 206 
 #, c-format
197 207 
 msgid "%s: --detect-forged-local-addresses is not compatible with --outgoing\n"
198 208 
 msgstr ""
199 209
200 
-#: clamav-milter.c:874
210 
+#: clamav-milter.c:896
201 211 
 #, c-format
202 212 
 msgid "%s: --detect-forged-local-addresses is not compatible with --local\n"
203 213 
 msgstr ""
204 214
205 
-#: clamav-milter.c:878
215 
+#: clamav-milter.c:900
206 216 
 #, c-format
207 217 
 msgid "%s: --detect-forged-local-addresses is not compatible with --force\n"
208 218 
 msgstr ""
209 219
210 
-#: clamav-milter.c:922
220 
+#: clamav-milter.c:944
211 221 
 #, c-format
212 222 
 msgid ""
213 223 
 "%s: The iface option to --broadcast is not supported on your operating "
214 224 
 "system\n"
215 225 
 msgstr ""
216 226
217 
-#: clamav-milter.c:931
227 
+#: clamav-milter.c:953
218 228 
 #, c-format
219 229 
 msgid "%s: Can't get information about user %s\n"
220 230 
 msgstr ""
221 231
222 
-#: clamav-milter.c:942
232 
+#: clamav-milter.c:964
223 233 
 #, c-format
224 234 
 msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n"
225 235 
 msgstr ""
226 236
227 
-#: clamav-milter.c:959
237 
+#: clamav-milter.c:981
228 238 
 #, c-format
229 239 
 msgid "Running as user %s (UID %d, GID %d)\n"
230 240 
 msgstr ""
231 241
232 
-#: clamav-milter.c:962
242 
+#: clamav-milter.c:984
233 243 
 #, c-format
234 244 
 msgid "%s: running as root is not recommended (check \"User\" in %s)\n"
235 245 
 msgstr ""
236 246
237 
-#: clamav-milter.c:964
247 
+#: clamav-milter.c:986
238 248 
 #, c-format
239 249 
 msgid "%s: Only root can set an interface for --broadcast\n"
240 250 
 msgstr ""
241 251
242 
-#: clamav-milter.c:969
252 
+#: clamav-milter.c:991
243 253 
 #, c-format
244 254 
 msgid "%s: Advisory mode doesn't work with quarantine mode\n"
245 255 
 msgstr ""
246 256
247 
-#: clamav-milter.c:977
257 
+#: clamav-milter.c:999
248 258 
 #, c-format
249 259 
 msgid "%s: Advisory mode doesn't work with quarantine directories\n"
250 260 
 msgstr ""
251 261
252 
-#: clamav-milter.c:983
262 
+#: clamav-milter.c:1005
253 263 
 #, c-format
254 264 
 msgid "%s: the quarantine directory must not contain the string 'ERROR'\n"
255 265 
 msgstr ""
256 266
257 
-#: clamav-milter.c:989
267 
+#: clamav-milter.c:1011
258 268 
 #, c-format
259 269 
 msgid "%s: the quarantine directory must not contain the string 'FOUND'\n"
260 270 
 msgstr ""
261 271
262 
-#: clamav-milter.c:995
272 
+#: clamav-milter.c:1017
263 273 
 #, c-format
264 274 
 msgid "%s: the quarantine directory must not contain the string 'OK'\n"
265 275 
 msgstr ""
266 276
267 
-#: clamav-milter.c:1012
277 
+#: clamav-milter.c:1034
268 278 
 #, c-format
269 279 
 msgid "%s: insecure quarantine directory %s (mode 0%o)\n"
270 280 
 msgstr ""
271 281
272 
-#: clamav-milter.c:1042
282 
+#: clamav-milter.c:1075
273 283 
 #, c-format
274 284 
 msgid "%s: ReadTimeout must not be negative in %s\n"
275 285 
 msgstr ""
276 286
277 
-#: clamav-milter.c:1051
287 
+#: clamav-milter.c:1084
278 288 
 #, c-format
279 289 
 msgid "%s: StreamMaxLength must not be negative in %s\n"
280 290 
 msgstr ""
281 291
282 
-#: clamav-milter.c:1078
292 
+#: clamav-milter.c:1111
283 293 
 #, c-format
284 294 
 msgid ""
285 295 
 "%s: (-q && !LogSyslog): warning - all interception message methods are off\n"
286 296 
 msgstr ""
287 297
288 
-#: clamav-milter.c:1088
298 
+#: clamav-milter.c:1121
289 299 
 #, c-format
290 300 
 msgid "%s: --max-children must be given if --external is not given\n"
291 301 
 msgstr ""
292 302
293 
-#: clamav-milter.c:1093
303 
+#: clamav-milter.c:1125
304 
+#, c-format
305 
+msgid "%s: --freshclam_monitor must be at least one second\n"
306 
+msgstr ""
307 
+
308 
+#: clamav-milter.c:1130
294 309 
 #, c-format
295 310 
 msgid "%s: --timeout must not be given if --external is not given\n"
296 311 
 msgstr ""
297 312
298 
-#: clamav-milter.c:1107
313 
+#: clamav-milter.c:1144
299 314 
 #, c-format
300 315 
 msgid "%s: You can select one server type only (local/TCP) in %s\n"
301 316 
 msgstr ""
302 317
303 
-#: clamav-milter.c:1117
318 
+#: clamav-milter.c:1154
304 319 
 #, c-format
305 320 
 msgid "The connection from sendmail to %s (%s) must not\n"
306 321 
 msgstr ""
307 322
308 
-#: clamav-milter.c:1119
323 
+#: clamav-milter.c:1156
309 324 
 #, c-format
310 325 
 msgid "be the same as the connection to clamd (%s) in %s\n"
311 326 
 msgstr ""
312 327
313 
-#: clamav-milter.c:1129 clamav-milter.c:1152
328 
+#: clamav-milter.c:1166 clamav-milter.c:1189
314 329 
 #, c-format
315 330 
 msgid "Can't talk to clamd server via %s\n"
316 331 
 msgstr ""
317 332
318 
-#: clamav-milter.c:1131 clamav-milter.c:1154
333 
+#: clamav-milter.c:1168 clamav-milter.c:1191
319 334 
 #, c-format
320 335 
 msgid "Check your entry for LocalSocket in %s\n"
321 336 
 msgstr ""
322 337
323 
-#: clamav-milter.c:1165
338 
+#: clamav-milter.c:1202
324 339 
 msgid "Can't create a clamd session"
325 340 
 msgstr ""
326 341
327 
-#: clamav-milter.c:1182
342 
+#: clamav-milter.c:1219
328 343 
 #, c-format
329 344 
 msgid "%s: --quarantine-dir not supported for TCPSocket - use --quarantine\n"
330 345 
 msgstr ""
331 346
332 
-#: clamav-milter.c:1197
347 
+#: clamav-milter.c:1234
333 348 
 #, c-format
334 349 
 msgid "%s: hostname %s is longer than %d characters\n"
335 350 
 msgstr ""
336 351
337 
-#: clamav-milter.c:1216 clamav-milter.c:1306
352 
+#: clamav-milter.c:1253 clamav-milter.c:1343
338 353 
 #, c-format
339 354 
 msgid "%s: --max-children must be given in sessions mode\n"
340 355 
 msgstr ""
341 356
342 
-#: clamav-milter.c:1239
357 
+#: clamav-milter.c:1276
343 358 
 #, c-format
344 359 
 msgid "%s: Unknown host %s\n"
345 360 
 msgstr ""
346 361
347 
-#: clamav-milter.c:1251
362 
+#: clamav-milter.c:1288
348 363 
 #, c-format
349 364 
 msgid "Can't talk to clamd server %s on port %d\n"
350 365 
 msgstr ""
351 366
352 
-#: clamav-milter.c:1255
367 
+#: clamav-milter.c:1292
353 368 
 #, c-format
354 369 
 msgid "Check the value for TCPAddr in %s\n"
355 370 
 msgstr ""
356 371
357 
-#: clamav-milter.c:1257
372 
+#: clamav-milter.c:1294
358 373 
 #, c-format
359 374 
 msgid "Check the value for TCPAddr in clamd.conf on %s\n"
360 375 
 msgstr ""
361 376
362 
-#: clamav-milter.c:1273
377 
+#: clamav-milter.c:1310
363 378 
 msgid "Can't find any active clamd servers\n"
364 379 
 msgstr ""
365 380
366 
-#: clamav-milter.c:1274 clamav-milter.c:1280
381 
+#: clamav-milter.c:1311 clamav-milter.c:1317
367 382 
 #, c-format
368 383 
 msgid "Check your entry for TCPSocket in %s\n"
369 384 
 msgstr ""
370 385
371 
-#: clamav-milter.c:1279
386 
+#: clamav-milter.c:1316
372 387 
 msgid "Can't find any clamd servers\n"
373 388 
 msgstr ""
374 389
375 
-#: clamav-milter.c:1286
390 
+#: clamav-milter.c:1323
376 391 
 #, c-format
377 392 
 msgid "%s: You must select server type (local/TCP) in %s\n"
378 393 
 msgstr ""
379 394
380 
-#: clamav-milter.c:1354
395 
+#: clamav-milter.c:1391
381 396 
 #, c-format
382 397 
 msgid "When debugging it is recommended that you use Foreground mode in %s\n"
383 398 
 msgstr ""
384 399
385 
-#: clamav-milter.c:1355
400 
+#: clamav-milter.c:1392
386 401 
 msgid "\tso that you can see all of the messages"
387 402 
 msgstr ""
388 403
389 
-#: clamav-milter.c:1441
404 
+#: clamav-milter.c:1478
390 405 
 #, c-format
391 406 
 msgid "%s: ScanMail not defined in %s (needed without --external), enabling\n"
392 407 
 msgstr ""
393 408
394 
-#: clamav-milter.c:1502
409 
+#: clamav-milter.c:1539
395 410 
 msgid "Starting clamav-milter"
396 411 
 msgstr ""
397 412
398 
-#: clamav-milter.c:1512
413 
+#: clamav-milter.c:1549
399 414 
 #, c-format
400 415 
 msgid "pidfile: '%s' must be a full pathname"
401 416 
 msgstr ""
402 417
403 
-#: clamav-milter.c:1514
418 
+#: clamav-milter.c:1551
404 419 
 #, c-format
405 420 
 msgid "pidfile '%s' must be a full pathname\n"
406 421 
 msgstr ""
407 422
408 
-#: clamav-milter.c:1528
423 
+#: clamav-milter.c:1565
409 424 
 #, c-format
410 425 
 msgid "Can't save PID in file %s"
411 426 
 msgstr ""
412 427
413 
-#: clamav-milter.c:1530
428 
+#: clamav-milter.c:1567
414 429 
 #, c-format
415 430 
 msgid "Can't save PID in file %s\n"
416 431 
 msgstr ""
417 432
418 
-#: clamav-milter.c:1592
433 
+#: clamav-milter.c:1629
419 434 
 #, c-format
420 435 
 msgid "Starting %s"
421 436 
 msgstr ""
422 437
423 
-#: clamav-milter.c:1595
438 
+#: clamav-milter.c:1632
424 439 
 msgid "Debugging is on"
425 440 
 msgstr ""
426 441
427 
-#: clamav-milter.c:1660 clamav-milter.c:1919
442 
+#: clamav-milter.c:1702 clamav-milter.c:1962
428 443 
 #, c-format
429 444 
 msgid "Check clamd server %s - it may be down\n"
430 445 
 msgstr ""
431 446
432 
-#: clamav-milter.c:1665
447 
+#: clamav-milter.c:1707
433 448 
 msgid "Check clamd server - it may be down"
434 449 
 msgstr ""
435 450
436 
-#: clamav-milter.c:1840
451 
+#: clamav-milter.c:1883
437 452 
 msgid "No free clamd sessions\n"
438 453 
 msgstr ""
439 454
440 
-#: clamav-milter.c:1922
455 
+#: clamav-milter.c:1965
441 456 
 #, c-format
442 457 
 msgid "Check clamd server %s - it may be down"
443 458 
 msgstr ""
444 459
445 
-#: clamav-milter.c:1928
460 
+#: clamav-milter.c:1971
446 461 
 msgid "Check clamd server - it may be down\n"
447 462 
 msgstr ""
448 463
449 
-#: clamav-milter.c:1964
464 
+#: clamav-milter.c:2007
450 465 
 msgid "findServer: select failed"
451 466 
 msgstr ""
452 467
453 
-#: clamav-milter.c:1973
468 
+#: clamav-milter.c:2016
454 469 
 #, c-format
455 470 
 msgid "findServer: using server %d\n"
456 471 
 msgstr ""
457 472
458 
-#: clamav-milter.c:1978
473 
+#: clamav-milter.c:2021
459 474 
 msgid "findServer: No response from any server\n"
460 475 
 msgstr ""
461 476
462 
-#: clamav-milter.c:1980
477 
+#: clamav-milter.c:2023
463 478 
 msgid "findServer: No response from any server"
464 479 
 msgstr ""
465 480
466 
-#: clamav-milter.c:2001
481 
+#: clamav-milter.c:2044
467 482 
 msgid "clamfi_connect: ctx is null"
468 483 
 msgstr ""
469 484
470 
-#: clamav-milter.c:2006
485 
+#: clamav-milter.c:2049
471 486 
 msgid "clamfi_connect: hostname is null"
472 487 
 msgstr ""
473 488
474 
-#: clamav-milter.c:2027
489 
+#: clamav-milter.c:2070
475 490 
 msgid "clamfi_connect: remoteIP is null"
476 491 
 msgstr ""
477 492
478 
-#: clamav-milter.c:2036
493 
+#: clamav-milter.c:2079
479 494 
 #, c-format
480 495 
 msgid "clamfi_connect: connection from %s"
481 496 
 msgstr ""
482 497
483 
-#: clamav-milter.c:2037
498 
+#: clamav-milter.c:2080
484 499 
 #, c-format
485 500 
 msgid "clamfi_connect: connection from %s\n"
486 501 
 msgstr ""
487 502
488 
-#: clamav-milter.c:2040
503 
+#: clamav-milter.c:2083
489 504 
 #, c-format
490 505 
 msgid "clamfi_connect: connection from %s [%s]"
491 506 
 msgstr ""
492 507
493 
-#: clamav-milter.c:2041
508 
+#: clamav-milter.c:2084
494 509 
 #, c-format
495 510 
 msgid "clamfi_connect: connection from %s [%s]\n"
496 511 
 msgstr ""
497 512
498 
-#: clamav-milter.c:2061
513 
+#: clamav-milter.c:2104
499 514 
 msgid "Can't get sendmail hostname"
500 515 
 msgstr ""
501 516
502 
-#: clamav-milter.c:2070
517 
+#: clamav-milter.c:2113
503 518 
 #, c-format
504 519 
 msgid "Access Denied: Host Unknown (%s)"
505 520 
 msgstr ""
506 521
507 
-#: clamav-milter.c:2079
522 
+#: clamav-milter.c:2122
508 523 
 #, c-format
509 524 
 msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n"
510 525 
 msgstr ""
511 526
512 
-#: clamav-milter.c:2090
527 
+#: clamav-milter.c:2133
513 528 
 #, c-format
514 529 
 msgid "Access Denied: Can't get IP address for (%s)"
515 530 
 msgstr ""
516 531
517 
-#: clamav-milter.c:2107
532 
+#: clamav-milter.c:2150
518 533 
 #, c-format
519 534 
 msgid "Access Denied for %s[%s]"
520 535 
 msgstr ""
521 536
522 
-#: clamav-milter.c:2125
537 
+#: clamav-milter.c:2168
523 538 
 msgid "clamfi_connect: not scanning outgoing messages"
524 539 
 msgstr ""
525 540
526 
-#: clamav-milter.c:2126
541 
+#: clamav-milter.c:2169
527 542 
 msgid "clamfi_connect: not scanning outgoing messages\n"
528 543 
 msgstr ""
529 544
530 
-#: clamav-milter.c:2134
545 
+#: clamav-milter.c:2177
531 546 
 msgid "clamfi_connect: not scanning local messages"
532 547 
 msgstr ""
533 548
534 
-#: clamav-milter.c:2135
549 
+#: clamav-milter.c:2178
535 550 
 msgid "clamfi_connect: not scanning local messages\n"
536 551 
 msgstr ""
537 552
538 
-#: clamav-milter.c:2149
553 
+#: clamav-milter.c:2192
539 554 
 msgid "clamfi_connect: gethostname failed"
540 555 
 msgstr ""
541 556
542 
-#: clamav-milter.c:2154
557 
+#: clamav-milter.c:2197
543 558 
 msgid "Rejected email falsely claiming to be from here"
544 559 
 msgstr ""
545 560
546 
-#: clamav-milter.c:2155
561 
+#: clamav-milter.c:2198
547 562 
 msgid "You have claimed to be me, but you are not"
548 563 
 msgstr ""
549 564
550 
-#: clamav-milter.c:2156 clamav-milter.c:2440
565 
+#: clamav-milter.c:2199 clamav-milter.c:2503
551 566 
 msgid "Forged local address detected"
552 567 
 msgstr ""
553 568
554 
-#: clamav-milter.c:2184
569 
+#: clamav-milter.c:2232
555 570 
 msgid "Rejected email with empty from field"
556 571 
 msgstr ""
557 572
558 
-#: clamav-milter.c:2185
573 
+#: clamav-milter.c:2233
559 574 
 msgid "You have not said who the email is from"
560 575 
 msgstr ""
561 576
562 
-#: clamav-milter.c:2186
577 
+#: clamav-milter.c:2234
563 578 
 msgid "Reject email with empty from field"
564 579 
 msgstr ""
565 580
566 
-#: clamav-milter.c:2208
581 
+#: clamav-milter.c:2267
567 582 
 #, c-format
568 583 
 msgid "hit max-children limit (%u >= %u)\n"
569 584 
 msgstr ""
570 585
571 
-#: clamav-milter.c:2209
586 
+#: clamav-milter.c:2268
572 587 
 #, c-format
573 588 
 msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"
574 589 
 msgstr ""
575 590
576 
-#: clamav-milter.c:2215
591 
+#: clamav-milter.c:2274
577 592 
 #, c-format
578 593 
 msgid "hit max-children limit (%u >= %u)"
579 594 
 msgstr ""
580 595
581 
-#: clamav-milter.c:2216
596 
+#: clamav-milter.c:2275
582 597 
 #, c-format
583 598 
 msgid "hit max-children limit (%u >= %u): waiting for some to exit"
584 599 
 msgstr ""
585 600
586 
-#: clamav-milter.c:2221
601 
+#: clamav-milter.c:2281
587 602 
 msgid "AV system temporarily overloaded - please try later"
588 603 
 msgstr ""
589 604
590 
-#: clamav-milter.c:2254
605 
+#: clamav-milter.c:2300
606 
+#, c-format
607 
+msgid "n_children %u: waiting %d seconds for some to exit"
608 
+msgstr ""
609 
+
610 
+#: clamav-milter.c:2316
611 
+#, c-format
612 
+msgid "Finished waiting, n_children = %u"
613 
+msgstr ""
614 
+
615 
+#: clamav-milter.c:2321
591 616 
 #, c-format
592 617 
 msgid ">n_children = %d\n"
593 618 
 msgstr ""
594 619
595 
-#: clamav-milter.c:2260
620 
+#: clamav-milter.c:2327
596 621 
 msgid "Timeout waiting for a child to die"
597 622 
 msgstr ""
598 623
599 
-#: clamav-milter.c:2262
624 
+#: clamav-milter.c:2329
600 625 
 msgid "Timeout waiting for a child to die\n"
601 626 
 msgstr ""
602 627
603 
-#: clamav-milter.c:2405
628 
+#: clamav-milter.c:2468
604 629 
 msgid "clamfi_eoh"
605 630 
 msgstr ""
606 631
607 
-#: clamav-milter.c:2408
632 
+#: clamav-milter.c:2471
608 633 
 msgid "clamfi_eoh\n"
609 634 
 msgstr ""
610 635
611 
-#: clamav-milter.c:2432
636 
+#: clamav-milter.c:2495
612 637 
 msgid "clamfi_eoh: gethostname failed"
613 638 
 msgstr ""
614 639
615 
-#: clamav-milter.c:2438
640 
+#: clamav-milter.c:2501
616 641 
 #, c-format
617 642 
 msgid "Rejected email falsely claiming to be from %s"
618 643 
 msgstr ""
619 644
620 
-#: clamav-milter.c:2439
645 
+#: clamav-milter.c:2502
621 646 
 msgid "You have claimed to be from me, but you are not"
622 647 
 msgstr ""
623 648
624 
-#: clamav-milter.c:2476
649 
+#: clamav-milter.c:2539
625 650 
 msgid "clamfi_eoh: ignoring whitelisted message"
626 651 
 msgstr ""
627 652
628 
-#: clamav-milter.c:2478
653 
+#: clamav-milter.c:2541
629 654 
 msgid "clamfi_eoh: ignoring whitelisted message\n"
630 655 
 msgstr ""
631 656
632 
-#: clamav-milter.c:2492
657 
+#: clamav-milter.c:2555
633 658 
 #, c-format
634 659 
 msgid "clamfi_envbody: %u bytes"
635 660 
 msgstr ""
636 661
637 
-#: clamav-milter.c:2494
662 
+#: clamav-milter.c:2557
638 663 
 #, c-format
639 664 
 msgid "clamfi_envbody: %u bytes\n"
640 665 
 msgstr ""
641 666
642 
-#: clamav-milter.c:2507 clamav-milter.c:2815
667 
+#: clamav-milter.c:2570 clamav-milter.c:2882
643 668 
 #, c-format
644 669 
 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"
645 670 
 msgstr ""
646 671
647 
-#: clamav-milter.c:2511 clamav-milter.c:2818
672 
+#: clamav-milter.c:2574 clamav-milter.c:2885
648 673 
 msgid "Not Scanned - StreamMaxLength exceeded"
649 674 
 msgstr ""
650 675
651 
-#: clamav-milter.c:2564
676 
+#: clamav-milter.c:2627
652 677 
 #, c-format
653 678 
 msgid "Failed to delete X-Virus-Status header %d"
654 679 
 msgstr ""
655 680
656 
-#: clamav-milter.c:2641
681 
+#: clamav-milter.c:2704
657 682 
 #, c-format
658 683 
 msgid "failed to send SCAN %s command to clamd"
659 684 
 msgstr ""
660 685
661 
-#: clamav-milter.c:2663
686 
+#: clamav-milter.c:2726
662 687 
 msgid "failed to send SCAN command to clamd"
663 688 
 msgstr ""
664 689
665 
-#: clamav-milter.c:2680
690 
+#: clamav-milter.c:2743
666 691 
 #, c-format
667 692 
 msgid "Waiting to read status from fd %d\n"
668 693 
 msgstr ""
669 694
670 
-#: clamav-milter.c:2693
695 
+#: clamav-milter.c:2756
671 696 
 #, c-format
672 697 
 msgid "clamfi_eom: read %s"
673 698 
 msgstr ""
674 699
675 
-#: clamav-milter.c:2694
700 
+#: clamav-milter.c:2757
676 701 
 #, c-format
677 702 
 msgid "clamfi_eom: read %s\n"
678 703 
 msgstr ""
679 704
680 
-#: clamav-milter.c:2711
705 
+#: clamav-milter.c:2774
681 706 
 #, c-format
682 707 
 msgid "clamfi_eom: read nothing from clamd on %s"
683 708 
 msgstr ""
684 709
685 
-#: clamav-milter.c:2713
710 
+#: clamav-milter.c:2776
686 711 
 #, c-format
687 712 
 msgid "clamfi_eom: read nothing from clamd on %s\n"
688 713 
 msgstr ""
689 714
690 
-#: clamav-milter.c:2758 clamav-milter.c:2804
715 
+#: clamav-milter.c:2821 clamav-milter.c:2867
691 716 
 msgid "Error determining host"
692 717 
 msgstr ""
693 718
694 
-#: clamav-milter.c:2823
719 
+#: clamav-milter.c:2890
695 720 
 msgid "Not Scanned"
696 721 
 msgstr ""
697 722
698 
-#: clamav-milter.c:2852
723 
+#: clamav-milter.c:2919
699 724 
 msgid "Infected with"
700 725 
 msgstr ""
701 726
702 
-#: clamav-milter.c:2873
727 
+#: clamav-milter.c:2940
703 728 
 #, c-format
704 729 
 msgid "Intercepted virus from %s to"
705 730 
 msgstr ""
706 731
707 
-#: clamav-milter.c:2963
708 
-msgid ""
709 
-"Subject: Virus intercepted\n"
710 
-"\n"
732 
+#: clamav-milter.c:3030
733 
+msgid "Subject: Virus intercepted\n"
734 
+msgstr ""
735 
+
736 
+#: clamav-milter.c:3046
737 
+#, c-format
738 
+msgid "Can't open e-mail template header file %s"
739 
+msgstr ""
740 
+
741 
+#: clamav-milter.c:3056
742 
+msgid "\n"
711 743 
 msgstr ""
712 744
713 
-#: clamav-milter.c:2971
745 
+#: clamav-milter.c:3064
714 746 
 msgid "A message you sent to\n"
715 747 
 msgstr ""
716 748
717 
-#: clamav-milter.c:2978
749 
+#: clamav-milter.c:3071
718 750 
 #, c-format
719 751 
 msgid "The message %1$s sent from %2$s to\n"
720 752 
 msgstr ""
721 753
722 
-#: clamav-milter.c:2981
754 
+#: clamav-milter.c:3074
723 755 
 #, c-format
724 756 
 msgid "A message sent from %s to\n"
725 757 
 msgstr ""
726 758
727 
-#: clamav-milter.c:2986
759 
+#: clamav-milter.c:3079
728 760 
 #, c-format
729 761 
 msgid "contained %s and has not been delivered.\n"
730 762 
 msgstr ""
731 763
732 
-#: clamav-milter.c:2989
764 
+#: clamav-milter.c:3082
733 765 
 #, c-format
734 766 
 msgid ""
735 767 
 "\n"
736 768 
 "The message in question has been quarantined as %s\n"
737 769 
 msgstr ""
738 770
739 
-#: clamav-milter.c:2992
771 
+#: clamav-milter.c:3085
740 772 
 #, c-format
741 773 
 msgid ""
742 774 
 "\n"
... ... 
@@ -744,13 +776,13 @@ msgid ""
744 744 
 "\n"
745 745 
 msgstr ""
746 746
747 
-#: clamav-milter.c:2995
747 
+#: clamav-milter.c:3088
748 748 
 msgid ""
749 749 
 "For your information, the original message headers were:\n"
750 750 
 "\n"
751 751 
 msgstr ""
752 752
753 
-#: clamav-milter.c:3008
753 
+#: clamav-milter.c:3101
754 754 
 #, c-format
755 755 
 msgid ""
756 756 
 "\n"
... ... 
@@ -758,239 +790,257 @@ msgid ""
758 758 
 "%s\t\n"
759 759 
 msgstr ""
760 760
761 
-#: clamav-milter.c:3018
761 
+#: clamav-milter.c:3111
762 762 
 #, c-format
763 763 
 msgid "Can't execute '%s' to send virus notice"
764 764 
 msgstr ""
765 765
766 
-#: clamav-milter.c:3047
766 
+#: clamav-milter.c:3144
767 
+#, c-format
768 
+msgid "Reported phishing to %s"
769 
+msgstr ""
770 
+
771 
+#: clamav-milter.c:3148
772 
+msgid "Can't set anti-phish header"
773 
+msgstr ""
774 
+
775 
+#: clamav-milter.c:3150
776 
+msgid "Can't set anti-phish header\n"
777 
+msgstr ""
778 
+
779 
+#: clamav-milter.c:3176
767 780 
 #, c-format
768 781 
 msgid "Can't set quarantine user %s"
769 782 
 msgstr ""
770 783
771 
-#: clamav-milter.c:3049
784 
+#: clamav-milter.c:3178
772 785 
 #, c-format
773 786 
 msgid "Can't set quarantine user %s\n"
774 787 
 msgstr ""
775 788
776 
-#: clamav-milter.c:3071
789 
+#: clamav-milter.c:3207
777 790 
 #, c-format
778 791 
 msgid "virus %s detected by ClamAV - http://www.clamav.net"
779 792 
 msgstr ""
780 793
781 
-#: clamav-milter.c:3076
794 
+#: clamav-milter.c:3212
782 795 
 msgid "Unknown"
783 796 
 msgstr ""
784 797
785 
-#: clamav-milter.c:3078
798 
+#: clamav-milter.c:3214
786 799 
 #, c-format
787 800 
 msgid "%s: incorrect message \"%s\" from clamd"
788 801 
 msgstr ""
789 802
790 
-#: clamav-milter.c:3084
803 
+#: clamav-milter.c:3220
791 804 
 msgid "Clean"
792 805 
 msgstr ""
793 806
794 
-#: clamav-milter.c:3088
807 
+#: clamav-milter.c:3224
795 808 
 #, c-format
796 809 
 msgid "%s: clean message from %s"
797 810 
 msgstr ""
798 811
799 
-#: clamav-milter.c:3090
812 
+#: clamav-milter.c:3226
800 813 
 msgid "an unknown sender"
801 814 
 msgstr ""
802 815
803 
-#: clamav-milter.c:3185
816 
+#: clamav-milter.c:3327
804 817 
 #, c-format
805 818 
 msgid "Can't remove clean file %s"
806 819 
 msgstr ""
807 820
808 
-#: clamav-milter.c:3376 clamav-milter.c:3379
821 
+#: clamav-milter.c:3520 clamav-milter.c:3523
809 822 
 #, c-format
810 823 
 msgid "write failure (%u bytes) to %s: %s"
811 824 
 msgstr ""
812 825
813 
-#: clamav-milter.c:3393 clamav-milter.c:3396
826 
+#: clamav-milter.c:3537 clamav-milter.c:3540
814 827 
 #, c-format
815 828 
 msgid "write failure (%u bytes) to clamd: %s"
816 829 
 msgstr ""
817 830
818 
-#: clamav-milter.c:3462
831 
+#: clamav-milter.c:3617
819 832 
 #, c-format
820 833 
 msgid "No data received from clamd in %d seconds\n"
821 834 
 msgstr ""
822 835
823 
-#: clamav-milter.c:3484
836 
+#: clamav-milter.c:3646
824 837 
 #, c-format
825 838 
 msgid "Can't stat %s"
826 839 
 msgstr ""
827 840
828 
-#: clamav-milter.c:3495 clamav-milter.c:3936
841 
+#: clamav-milter.c:3657 clamav-milter.c:4103
829 842 
 #, c-format
830 843 
 msgid "Can't open %s"
831 844 
 msgstr ""
832 845
833 
-#: clamav-milter.c:3620 clamav-milter.c:4105
846 
+#: clamav-milter.c:3782 clamav-milter.c:4280
834 847 
 #, c-format
835 848 
 msgid "mkdir %s failed"
836 849 
 msgstr ""
837 850
838 
-#: clamav-milter.c:3632
851 
+#: clamav-milter.c:3797
839 852 
 #, c-format
840 853 
 msgid "mktemp %s failed"
841 854 
 msgstr ""
842 855
843 
-#: clamav-milter.c:3642
856 
+#: clamav-milter.c:3807
844 857 
 #, c-format
845 858 
 msgid "Temporary quarantine file %s creation failed"
846 859 
 msgstr ""
847 860
848 
-#: clamav-milter.c:3745
861 
+#: clamav-milter.c:3912
849 862 
 #, c-format
850 863 
 msgid "failed to send STREAM command clamd server %d"
851 864 
 msgstr ""
852 865
853 
-#: clamav-milter.c:3754
866 
+#: clamav-milter.c:3921
854 867 
 msgid "failed to send STREAM command clamd"
855 868 
 msgstr ""
856 869
857 
-#: clamav-milter.c:3766
870 
+#: clamav-milter.c:3933
858 871 
 msgid "failed to create TCPSocket to talk to clamd"
859 872 
 msgstr ""
860 873
861 
-#: clamav-milter.c:3778 clamav-milter.c:3794
874 
+#: clamav-milter.c:3945 clamav-milter.c:3961
862 875 
 msgid "recv failed from clamd getting PORT"
863 876 
 msgstr ""
864 877
865 
-#: clamav-milter.c:3782 clamav-milter.c:3796
878 
+#: clamav-milter.c:3949 clamav-milter.c:3963
866 879 
 msgid "EOF from clamd getting PORT"
867 880 
 msgstr ""
868 881
869 
-#: clamav-milter.c:3807
882 
+#: clamav-milter.c:3974
870 883 
 #, c-format
871 884 
 msgid "Expected port information from clamd, got '%s'"
872 885 
 msgstr ""
873 886
874 
-#: clamav-milter.c:3810
887 
+#: clamav-milter.c:3977
875 888 
 #, c-format
876 889 
 msgid "Expected port information from clamd, got '%s'\n"
877 890 
 msgstr ""
878 891
879 
-#: clamav-milter.c:3830 clamav-milter.c:3833
892 
+#: clamav-milter.c:3997 clamav-milter.c:4000
880 893 
 #, c-format
881 894 
 msgid "Connecting to local port %d - data %d cmd %d\n"
882 895 
 msgstr ""
883 896
884 
-#: clamav-milter.c:3848 clamav-milter.c:3851
897 
+#: clamav-milter.c:4015 clamav-milter.c:4018
885 898 
 #, c-format
886 899 
 msgid "Failed to connect to port %d given by clamd: %s"
887 900 
 msgstr ""
888 901
889 
-#: clamav-milter.c:3948
902 
+#: clamav-milter.c:4115
890 903 
 #, c-format
891 904 
 msgid "Clamd (pid %d) seems to have died"
892 905 
 msgstr ""
893 906
894 
-#: clamav-milter.c:3974
907 
+#: clamav-milter.c:4141
895 908 
 #, c-format
896 909 
 msgid "Can't open e-mail template file %s"
897 910 
 msgstr ""
898 911
899 
-#: clamav-milter.c:3983
912 
+#: clamav-milter.c:4150
900 913 
 #, c-format
901 914 
 msgid "Can't stat e-mail template file %s"
902 915 
 msgstr ""
903 916
904 
-#: clamav-milter.c:3992
917 
+#: clamav-milter.c:4159
905 918 
 msgid "Out of memory"
906 919 
 msgstr ""
907 920
908 
-#: clamav-milter.c:4019
921 
+#: clamav-milter.c:4165
922 
+#, c-format
923 
+msgid "Error reading e-mail template file %s"
924 
+msgstr ""
925 
+
926 
+#: clamav-milter.c:4194
909 927 
 #, c-format
910 928 
 msgid "%s: Unknown clamAV variable \"%c\"\n"
911 929 
 msgstr ""
912 930
913 
-#: clamav-milter.c:4030
931 
+#: clamav-milter.c:4205
914 932 
 #, c-format
915 933 
 msgid "%s: Unterminated sendmail variable \"%s\"\n"
916 934 
 msgstr ""
917 935
918 
-#: clamav-milter.c:4041
936 
+#: clamav-milter.c:4216
919 937 
 #, c-format
920 938 
 msgid "%s: Unknown sendmail variable \"%s\"\n"
921 939 
 msgstr ""
922 940
923 
-#: clamav-milter.c:4131
941 
+#: clamav-milter.c:4306
924 942 
 #, c-format
925 943 
 msgid "Can't rename %1$s to %2$s"
926 944 
 msgstr ""
927 945
928 
-#: clamav-milter.c:4140
946 
+#: clamav-milter.c:4315
929 947 
 #, c-format
930 948 
 msgid "Email quarantined as %s"
931 949 
 msgstr ""
932 950
933 
-#: clamav-milter.c:4232
951 
+#: clamav-milter.c:4420
934 952 
 #, c-format
935 953 
 msgid "[Virus] %s"
936 954 
 msgstr ""
937 955
938 
-#: clamav-milter.c:4326
956 
+#: clamav-milter.c:4516
939 957 
 msgid ""
940 958 
 "No response from any clamd server - your AV system is not scanning emails\n"
941 959 
 msgstr ""
942 960
943 
-#: clamav-milter.c:4329
961 
+#: clamav-milter.c:4519
944 962 
 msgid ""
945 963 
 "No response from any clamd server - your AV system is not scanning emails"
946 964 
 msgstr ""
947 965
948 
-#: clamav-milter.c:4347
966 
+#: clamav-milter.c:4537
949 967 
 msgid "Subject: ClamAV Down\n"
950 968 
 msgstr ""
951 969
952 
-#: clamav-milter.c:4350
970 
+#: clamav-milter.c:4540
953 971 
 msgid ""
954 972 
 "This is an automatic message\n"
955 973 
 "\n"
956 974 
 msgstr ""
957 975
958 
-#: clamav-milter.c:4353
976 
+#: clamav-milter.c:4543
959 977 
 msgid "The clamd program cannot be contacted.\n"
960 978 
 msgstr ""
961 979
962 
-#: clamav-milter.c:4355
980 
+#: clamav-milter.c:4545
963 981 
 msgid "No clamd server can be contacted.\n"
964 982 
 msgstr ""
965 983
966 
-#: clamav-milter.c:4357
984 
+#: clamav-milter.c:4547
967 985 
 msgid "Emails may not be being scanned, please check your servers.\n"
968 986 
 msgstr ""
969 987
970 
-#: clamav-milter.c:4424 clamav-milter.c:4582
988 
+#: clamav-milter.c:4614 clamav-milter.c:4772
971 989 
 msgid "Loading new database"
972 990 
 msgstr ""
973 991
974 
-#: clamav-milter.c:4696
992 
+#: clamav-milter.c:4886
975 993 
 #, c-format
976 994 
 msgid "Stopping %s"
977 995 
 msgstr ""
978 996
979 
-#: clamav-milter.c:4744
997 
+#: clamav-milter.c:4934
980 998 
 msgid "Stopping clamav-milter"
981 999 
 msgstr ""
982 1000
983 
-#: clamav-milter.c:4871
1001 
+#: clamav-milter.c:5061
984 1002 
 #, c-format
985 1003 
 msgid "Loaded %s"
986 1004 
 msgstr ""
987 1005
988 
-#: clamav-milter.c:4875
1006 
+#: clamav-milter.c:5065
989 1007 
 #, c-format
990 1008 
 msgid "ClamAV: Protecting against %u viruses"
991 1009 
 msgstr ""
992 1010
993 
-#: clamav-milter.c:5027
1011 
+#: clamav-milter.c:5219
994 1012 
 #, c-format
995 1013 
 msgid "Can't open white-list file %s"
996 1014 
 msgstr ""
clamav-devel/docs/man/clamav-milter.8
History View file @ e8a362f
... ... 
@@ -217,6 +217,12 @@ If the \-t option is not given, clamav\-milter defaults to a hard-coded message.
217 217 
 Note that to send warning messages, clamav\-milter must be able to execute
218 218 
 sendmail.
219 219 
 .TP
220 
+\fB\-\-template\-headers=file\fR
221 
+File points to a file whose contents are added to the headers of the
222 
+warning message given to the \fB\-\-template\-file\fR option.
223 
+For example, to state the character set of the message,
224 
+put "Content-Type: text/plain; charset=koi8-r" into the file.
225 
+.TP
220 226 
 \fB\-\-timeout=n \-T n\fR
221 227 
 Used in conjunction with max\-children. If clamav\-milter waits for more than
222 228 
 \fIn\fR seconds (default 300) it proceeds with scanning. Setting \fIn\fR to zero