1. clamav-devel
  2. Commit c857005e0da19ba000305c9a69f92f0da6f127a1
Browse code

Update clamav.conf references

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

Nigel Horne authored on 2004/09/20 18:10:51
Showing 4 changed files
ChangeLog
History View file @ c857005
... ... 
@@ -1,3 +1,8 @@
1 
+Mon Sep 20 10:09:55 BST 2004 (njh)
2 
+----------------------------------
3 
+  * clamav-milter:	Change to clamd.conf
4 
+  			Remove StreamSaveToDisk check
5 
+
1 6 
 Mon Sep 20 01:44:47 CEST 2004 (tk)
2 7 
 ----------------------------------
3 8 
   * docs: update
clamav-milter/INSTALL
History View file @ c857005
... ... 
@@ -83,9 +83,8 @@ Installations for RedHat Linux and it's derivatives such as YellowDog:
83 83 
 	INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav/clmilter.sock, F=, T=S:4m;R:4m')dnl
84 84 
 	define(`confINPUT_MAIL_FILTERS', `clamav')
85 85
86 
-	Check entry in /usr/local/etc/clamav.conf of the form:
86 
+	Check entry in /usr/local/etc/clamd.conf of the form:
87 87 
 	LocalSocket /var/run/clamav/clamd.sock
88 
-	StreamSaveToDisk
89 88
90 89 
 	If you already have a filter (such as spamassassin-milter from
91 90 
 	http://savannah.nongnu.org/projects/spamass-milt) add it thus:
... ... 
@@ -94,7 +93,7 @@ Installations for RedHat Linux and it's derivatives such as YellowDog:
94 94 
 	define(`confINPUT_MAIL_FILTERS', `spamassassin,clamav')dnl
95 95
96 96 
 	mkdir /var/run/clamav
97 
-	chown clamav /var/run/clamav	(if you use User clamav in clamav.conf)
97 
+	chown clamav /var/run/clamav	(if you use User clamav in clamd.conf)
98 98 
 	chmod 700 /var/run/clamav
99 99
100 100 
 	Where /var/run/spamass.sock is the location of the spamass-milt
... ... 
@@ -137,9 +136,9 @@ As with all software it is wise to ensure that clamav-milter has the least
137 137 
 privileges it needs to run. So don't run it as root and don't store the sockets
138 138 
 in a directory that can be written by everyone. For example ensure that /var/run
139 139 
 is owned and writable only by root and add entries for 'User' and
140 
-'FixStaleSocket' in clamav.conf.
140 
+'FixStaleSocket' in clamd.conf.
141 141
142 
-When using UNIX domain sockets via the LocalSocket option of clamav.conf,
142 
+When using UNIX domain sockets via the LocalSocket option of clamd.conf,
143 143 
 we recommend that you use the --quarantine-dir option since that may improve
144 144 
 performance.
145 145
... ... 
@@ -495,6 +494,8 @@ Changes
495 495 
 0.75r	17/9/04	--help didn't include information about --max-children
496 496 
 		Fix problem in the template file handling where sendmail
497 497 
 		variables did't work after clamav variables.
498 
+0.75s	20/9/04	StreamSaveToDisk is longer used
499 
+		Update references to clamav.conf, should now be clamd.conf
498 500
499 501 
 INTERNATIONALISATION
500 502
clamav-milter/clamav-milter.c
History View file @ c857005
... ... 
@@ -26,6 +26,9 @@
26 26 
  *
27 27 
  * Change History:
28 28 
  * $Log: clamav-milter.c,v $
29 
+ * Revision 1.130  2004/09/20 09:09:23  nigelhorne
30 
+ * Update clamav.conf references
31 
+ *
29 32 
  * Revision 1.129  2004/09/17 15:40:02  nigelhorne
30 33 
  * Handle sendmail variables after clamav variables
31 34 
  *
... ... 
@@ -398,9 +401,9 @@
398 398 
  * Revision 1.6  2003/09/28 16:37:23  nigelhorne
399 399 
  * Added -f flag use MaxThreads if --max-children not set
400 400 
  */
401 
-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.129 2004/09/17 15:40:02 nigelhorne Exp $";
401 
+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.130 2004/09/20 09:09:23 nigelhorne Exp $";
402 402
403 
-#define	CM_VERSION	"0.75r"
403 
+#define	CM_VERSION	"0.75s"
404 404
405 405 
 /*#define	CONFDIR	"/usr/local/etc"*/
406 406
... ... 
@@ -489,8 +492,7 @@ typedef	unsigned short	in_port_t;
489 489 
  *
490 490 
  * It is however OK for testing: code is now in place to reopen as session
491 491 
  * that has gone bad, and it would be useful to find out the set of
492 
- * circumstances that causes clamd to loop, unless it's the SESSION close
493 
- * without END bug
492 
+ * circumstances that causes clamd to loop
494 493 
  */
495 494 
 /*#define	SESSION	/*
496 495 
 		 * Keep one command connection open to clamd, otherwise a new
... ... 
@@ -501,7 +503,7 @@ typedef	unsigned short	in_port_t;
501 501 
  * TODO: optional: xmessage on console when virus stopped (SNMP would be real nice!)
502 502 
  *	Having said that, with LogSysLog you can (on Linux) configure the system
503 503 
  *	to get messages on the system console, see syslog.conf(5), also you
504 
- *	can use wall(1) in the VirusEvent entry in clamav.conf
504 
+ *	can use wall(1) in the VirusEvent entry in clamd.conf
505 505 
  * TODO: build with libclamav.so rather than libclamav.a
506 506 
  * TODO: Support LogTime and Logfile from the conf file
507 507 
  * TODO: Warn if TCPAddr doesn't allow connection from us
... ... 
@@ -530,7 +532,7 @@ typedef struct header_list_struct *header_list_t;
530 530 
  * Andy Fiddaman <clam@fiddaman.net> added 69.254.0.0/16
531 531 
  *	(Microsoft default DHCP)
532 532 
  *
533 
- * TODO: read this table in from a file (clamav.conf?)
533 
+ * TODO: read this table in from a file (clamd.conf?)
534 534 
  */
535 535 
 #define PACKADDR(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
536 536 
 #define MAKEMASK(bits)       (0xffffffff << (bits))
... ... 
@@ -630,7 +632,7 @@ static	int	qflag = 0;	/*
630 630 
 				 * Send no warnings when a virus is found,
631 631 
 				 * this means that the only log of viruses
632 632 
 				 * found is the syslog, so it's best to
633 
-				 * enable LogSyslog in clamav.conf
633 
+				 * enable LogSyslog in clamd.conf
634 634 
 				 */
635 635 
 static	int	Sflag = 0;	/*
636 636 
 				 * Add a signature to each message that
... ... 
@@ -670,9 +672,9 @@ static	int	cl_error = SMFIS_TEMPFAIL; /*
670 670 
 				 */
671 671 
 static	int	readTimeout = CL_DEFAULT_SCANTIMEOUT; /*
672 672 
 				 * number of seconds to wait for clamd to
673 
-				 * respond, see ReadTimeout in clamav.conf
673 
+				 * respond, see ReadTimeout in clamd.conf
674 674 
 				 */
675 
-static	long	streamMaxLength = -1;	/* StreamMaxLength from clamav.conf */
675 
+static	long	streamMaxLength = -1;	/* StreamMaxLength from clamd.conf */
676 676 
 static	int	logClean = 1;	/*
677 677 
 				 * Add clean items to the log file
678 678 
 				 */
... ... 
@@ -952,7 +954,7 @@ main(int argc, char **argv)
952 952 
 			case 'b':	/* bounce worms/viruses */
953 953 
 				bflag++;
954 954 
 				break;
955 
-			case 'c':	/* where is clamav.conf? */
955 
+			case 'c':	/* where is clamd.conf? */
956 956 
 				cfgfile = optarg;
957 957 
 				break;
958 958 
 			case 'C':	/* dont log clean */
... ... 
@@ -1098,7 +1100,7 @@ main(int argc, char **argv)
1098 1098 
 				cli_dbgmsg(_("Running as user %s (UID %d, GID %d)\n"),
1099 1099 
 					cpt->strarg, user->pw_uid, user->pw_gid);
1100 1100 
 		} else
1101 
-			fprintf(stderr, _("%s: running as root is not recommended (check \"User\" in clamav.conf)\n"), argv[0]);
1101 
+			fprintf(stderr, _("%s: running as root is not recommended (check \"User\" in clamd.conf)\n"), argv[0]);
1102 1102 
 	}
1103 1103 
 	if(advisory && quarantine) {
1104 1104 
 		fprintf(stderr, _("%s: Advisory mode doesn't work with quarantine mode\n"), argv[0]);
... ... 
@@ -1138,12 +1140,6 @@ main(int argc, char **argv)
1138 1138 
 		return EX_CONFIG;
1139 1139 
 	}
1140 1140
1141 
-	if(!cfgopt(copt, "StreamSaveToDisk")) {
1142 
-		fprintf(stderr, _("%s: StreamSavetoDisk not enabled in %s\n"),
1143 
-			argv[0], cfgfile);
1144 
-		return EX_CONFIG;
1145 
-	}
1146 
-
1147 1141 
 	if(!cfgopt(copt, "ScanMail")) {
1148 1142 
 		/*
1149 1143 
 		 * In fact ScanMail isn't needed if this machine doesn't run
... ... 
@@ -1418,7 +1414,7 @@ main(int argc, char **argv)
1418 1418 
 		 * us
1419 1419 
 		 *
1420 1420 
 		 * TODO: There's a security problem here that'll need fixing if
1421 
-		 * the User entry of clamav.conf is not used
1421 
+		 * the User entry of clamd.conf is not used
1422 1422 
 		 */
1423 1423 
 		if(strncasecmp(port, "unix:", 5) == 0) {
1424 1424 
 			if(unlink(&port[5]) < 0)
... ... 
@@ -3399,7 +3395,7 @@ checkClamd(void)
3399 3399 
 		return;	/* communicating via TCP */
3400 3400
3401 3401 
 	if(pidFile == NULL)
3402 
-		return;	/* PidFile directive missing from clamav.conf */
3402 
+		return;	/* PidFile directive missing from clamd.conf */
3403 3403
3404 3404 
 	fd = open(pidFile, O_RDONLY);
3405 3405 
 	if(fd < 0) {
clamav-milter/clamav-milter.po
History View file @ c857005
... ... 
@@ -8,7 +8,7 @@ msgid ""
8 8 
 msgstr ""
9 9 
 "Project-Id-Version: PACKAGE VERSION\n"
10 10 
 "Report-Msgid-Bugs-To: bugs@clamav.net\n"
11 
-"POT-Creation-Date: 2004-09-15 09:45+0100\n"
11 
+"POT-Creation-Date: 2004-09-20 10:01+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,547 +16,541 @@ msgstr ""
16 16 
 "Content-Type: text/plain; charset=CHARSET\n"
17 17 
 "Content-Transfer-Encoding: 8bit\n"
18 18
19 
-#: clamav-milter.c:744
19 
+#: clamav-milter.c:749
20 20 
 msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them."
21 21 
 msgstr ""
22 22
23 
-#: clamav-milter.c:745
23 
+#: clamav-milter.c:750
24 24 
 msgid "\t--bounce\t\t-b\tSend a failure message to the sender."
25 25 
 msgstr ""
26 26
27 
-#: clamav-milter.c:746
27 
+#: clamav-milter.c:751
28 28 
 msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE."
29 29 
 msgstr ""
30 30
31 
-#: clamav-milter.c:747
31 
+#: clamav-milter.c:752
32 32 
 msgid "\t--debug\t\t\t-D\tPrint debug messages."
33 33 
 msgstr ""
34 34
35 
-#: clamav-milter.c:748
35 
+#: clamav-milter.c:753
36 36 
 msgid ""
37 37 
 "\t--dont-log-clean\t-C\tDon't add an entry to syslog that a mail is clean."
38 38 
 msgstr ""
39 39
40 
-#: clamav-milter.c:749
40 
+#: clamav-milter.c:754
41 41 
 msgid ""
42 42 
 "\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error "
43 43 
 "occurs."
44 44 
 msgstr ""
45 45
46 
-#: clamav-milter.c:750
46 
+#: clamav-milter.c:755
47 47 
 msgid "\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded."
48 48 
 msgstr ""
49 49
50 
-#: clamav-milter.c:751
50 
+#: clamav-milter.c:756
51 51 
 msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."
52 52 
 msgstr ""
53 53
54 
-#: clamav-milter.c:752
54 
+#: clamav-milter.c:757
55 55 
 msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)."
56 56 
 msgstr ""
57 57
58 
-#: clamav-milter.c:753
58 
+#: clamav-milter.c:758
59 59 
 msgid "\t--help\t\t\t-h\tThis message."
60 60 
 msgstr ""
61 61
62 
-#: clamav-milter.c:754
62 
+#: clamav-milter.c:759
63 63 
 msgid "\t--headers\t\t-H\tInclude original message headers in the report."
64 64 
 msgstr ""
65 65
66 
-#: clamav-milter.c:755
66 
+#: clamav-milter.c:760
67 67 
 msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN."
68 68 
 msgstr ""
69 69
70 
-#: clamav-milter.c:756
70 
+#: clamav-milter.c:761
71 71 
 msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans."
72 72 
 msgstr ""
73 73
74 
-#: clamav-milter.c:757
74 
+#: clamav-milter.c:762
75 75 
 msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine."
76 76 
 msgstr ""
77 77
78 
-#: clamav-milter.c:758
78 
+#: clamav-milter.c:763
79 79 
 msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."
80 80 
 msgstr ""
81 81
82 
-#: clamav-milter.c:759
82 
+#: clamav-milter.c:764
83 83 
 msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."
84 84 
 msgstr ""
85 85
86 
-#: clamav-milter.c:760
86 
+#: clamav-milter.c:765
87 87 
 msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."
88 88 
 msgstr ""
89 89
90 
-#: clamav-milter.c:761
90 
+#: clamav-milter.c:766
91 91 
 msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."
92 92 
 msgstr ""
93 93
94 
-#: clamav-milter.c:762
94 
+#: clamav-milter.c:767
95 95 
 msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster."
96 96 
 msgstr ""
97 97
98 
-#: clamav-milter.c:763
98 
+#: clamav-milter.c:768
99 99 
 msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."
100 100 
 msgstr ""
101 101
102 
-#: clamav-milter.c:764
102 
+#: clamav-milter.c:769
103 103 
 msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account."
104 104 
 msgstr ""
105 105
106 
-#: clamav-milter.c:765
106 
+#: clamav-milter.c:770
107 107 
 msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."
108 108 
 msgstr ""
109 109
110 
-#: clamav-milter.c:766
110 
+#: clamav-milter.c:771
111 111 
 msgid ""
112 112 
 "\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running "
113 113 
 "clamd (when using TCPsocket)."
114 114 
 msgstr ""
115 115
116 
-#: clamav-milter.c:767
116 
+#: clamav-milter.c:772
117 117 
 msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."
118 118 
 msgstr ""
119 119
120 
-#: clamav-milter.c:768
120 
+#: clamav-milter.c:773
121 121 
 msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file."
122 122 
 msgstr ""
123 123
124 
-#: clamav-milter.c:769
124 
+#: clamav-milter.c:774
125 125 
 msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."
126 126 
 msgstr ""
127 127
128 
-#: clamav-milter.c:770
128 
+#: clamav-milter.c:775
129 129 
 msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die."
130 130 
 msgstr ""
131 131
132 
-#: clamav-milter.c:771
132 
+#: clamav-milter.c:776
133 133 
 msgid "\t--version\t\t-V\tPrint the version number of this software."
134 134 
 msgstr ""
135 135
136 
-#: clamav-milter.c:773
136 
+#: clamav-milter.c:778
137 137 
 msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'."
138 138 
 msgstr ""
139 139
140 
-#: clamav-milter.c:775
140 
+#: clamav-milter.c:780
141 141 
 msgid ""
142 142 
 "\n"
143 143 
 "For more information type \"man clamav-milter\"."
144 144 
 msgstr ""
145 145
146 
-#: clamav-milter.c:776
146 
+#: clamav-milter.c:781
147 147 
 msgid "Report bugs to bugs@clamav.net."
148 148 
 msgstr ""
149 149
150 
-#: clamav-milter.c:1044
150 
+#: clamav-milter.c:1049
151 151 
 #, c-format
152 152 
 msgid "%s: No socket-addr given\n"
153 153 
 msgstr ""
154 154
155 
-#: clamav-milter.c:1053
155 
+#: clamav-milter.c:1058
156 156 
 #, c-format
157 157 
 msgid "%s: Can't parse the config file %s\n"
158 158 
 msgstr ""
159 159
160 
-#: clamav-milter.c:1064
160 
+#: clamav-milter.c:1069
161 161 
 #, c-format
162 162 
 msgid "%s: Can't get information about user %s\n"
163 163 
 msgstr ""
164 164
165 
-#: clamav-milter.c:1075
165 
+#: clamav-milter.c:1080
166 166 
 #, c-format
167 167 
 msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n"
168 168 
 msgstr ""
169 169
170 
-#: clamav-milter.c:1092
170 
+#: clamav-milter.c:1097
171 171 
 #, c-format
172 172 
 msgid "Running as user %s (UID %d, GID %d)\n"
173 173 
 msgstr ""
174 174
175 
-#: clamav-milter.c:1095
175 
+#: clamav-milter.c:1100
176 176 
 #, c-format
177 
-msgid ""
178 
-"%s: running as root is not recommended (check \"User\" in clamav.conf)\n"
177 
+msgid "%s: running as root is not recommended (check \"User\" in clamd.conf)\n"
179 178 
 msgstr ""
180 179
181 
-#: clamav-milter.c:1098
180 
+#: clamav-milter.c:1103
182 181 
 #, c-format
183 182 
 msgid "%s: Advisory mode doesn't work with quarantine mode\n"
184 183 
 msgstr ""
185 184
186 
-#: clamav-milter.c:1105
185 
+#: clamav-milter.c:1110
187 186 
 #, c-format
188 187 
 msgid "%s: Advisory mode doesn't work with quarantine directories\n"
189 188 
 msgstr ""
190 189
191 
-#: clamav-milter.c:1121
190 
+#: clamav-milter.c:1126
192 191 
 #, c-format
193 192 
 msgid "%s: insecure quarantine directory %s (mode 0%o)\n"
194 193 
 msgstr ""
195 194
196 
-#: clamav-milter.c:1136
197 
-#, c-format
198 
-msgid "%s: StreamSavetoDisk not enabled in %s\n"
199 
-msgstr ""
200 
-
201 
-#: clamav-milter.c:1146
195 
+#: clamav-milter.c:1145
202 196 
 #, c-format
203 197 
 msgid "%s: ScanMail not enabled in %s\n"
204 198 
 msgstr ""
205 199
206 
-#: clamav-milter.c:1163
200 
+#: clamav-milter.c:1162
207 201 
 #, c-format
208 202 
 msgid "%s: ReadTimeout must not be negative in %s\n"
209 203 
 msgstr ""
210 204
211 
-#: clamav-milter.c:1170
205 
+#: clamav-milter.c:1169
212 206 
 #, c-format
213 207 
 msgid "%s: StreamMaxLength must not be negative in %s\n"
214 208 
 msgstr ""
215 209
216 
-#: clamav-milter.c:1185
210 
+#: clamav-milter.c:1184
217 211 
 #, c-format
218 212 
 msgid "%s: You can select one server type only (local/TCP) in %s\n"
219 213 
 msgstr ""
220 214
221 
-#: clamav-milter.c:1195 clamav-milter.c:1218
215 
+#: clamav-milter.c:1194 clamav-milter.c:1217
222 216 
 #, c-format
223 217 
 msgid "Can't talk to clamd server via %s\n"
224 218 
 msgstr ""
225 219
226 
-#: clamav-milter.c:1197 clamav-milter.c:1220
220 
+#: clamav-milter.c:1196 clamav-milter.c:1219
227 221 
 #, c-format
228 222 
 msgid "Check your entry for LocalSocket in %s\n"
229 223 
 msgstr ""
230 224
231 
-#: clamav-milter.c:1231
225 
+#: clamav-milter.c:1230
232 226 
 msgid "Can't create a clamd session"
233 227 
 msgstr ""
234 228
235 
-#: clamav-milter.c:1243
229 
+#: clamav-milter.c:1242
236 230 
 #, c-format
237 231 
 msgid ""
238 232 
 "%s: --quarantine-dir not supported for remote scanning - use --quarantine\n"
239 233 
 msgstr ""
240 234
241 
-#: clamav-milter.c:1270
235 
+#: clamav-milter.c:1269
242 236 
 #, c-format
243 237 
 msgid "%s: Sessions does not multiplex\n"
244 238 
 msgstr ""
245 239
246 
-#: clamav-milter.c:1286
240 
+#: clamav-milter.c:1285
247 241 
 #, c-format
248 242 
 msgid "%s: Unknown host %s\n"
249 243 
 msgstr ""
250 244
251 
-#: clamav-milter.c:1298
245 
+#: clamav-milter.c:1297
252 246 
 #, c-format
253 247 
 msgid "Can't talk to clamd server %s on port %d\n"
254 248 
 msgstr ""
255 249
256 
-#: clamav-milter.c:1313
250 
+#: clamav-milter.c:1312
257 251 
 msgid "Can't find any clamd servers\n"
258 252 
 msgstr ""
259 253
260 
-#: clamav-milter.c:1314
254 
+#: clamav-milter.c:1313
261 255 
 #, c-format
262 256 
 msgid "Check your entry for TCPSocket in %s\n"
263 257 
 msgstr ""
264 258
265 
-#: clamav-milter.c:1320
259 
+#: clamav-milter.c:1319
266 260 
 #, c-format
267 261 
 msgid "%s: You must select server type (local/TCP) in %s\n"
268 262 
 msgstr ""
269 263
270 
-#: clamav-milter.c:1327
264 
+#: clamav-milter.c:1326
271 265 
 #, c-format
272 266 
 msgid "When debugging it is recommended that you use Foreground mode in %s\n"
273 267 
 msgstr ""
274 268
275 
-#: clamav-milter.c:1328
269 
+#: clamav-milter.c:1327
276 270 
 msgid "So that you can see all of the messages"
277 271 
 msgstr ""
278 272
279 
-#: clamav-milter.c:1378
273 
+#: clamav-milter.c:1377
280 274 
 #, c-format
281 275 
 msgid "Starting: %s"
282 276 
 msgstr ""
283 277
284 
-#: clamav-milter.c:1383
278 
+#: clamav-milter.c:1382
285 279 
 msgid "Debugging is on"
286 280 
 msgstr ""
287 281
288 
-#: clamav-milter.c:1387
282 
+#: clamav-milter.c:1386
289 283 
 #, c-format
290 284 
 msgid ""
291 285 
 "%s: (-q && !LogSyslog): warning - all interception message methods are off\n"
292 286 
 msgstr ""
293 287
294 
-#: clamav-milter.c:1399
288 
+#: clamav-milter.c:1398
295 289 
 #, c-format
296 290 
 msgid "Can't save PID in file %s"
297 291 
 msgstr ""
298 292
299 
-#: clamav-milter.c:1401
293 
+#: clamav-milter.c:1400
300 294 
 #, c-format
301 295 
 msgid "Can't save PID in file %s\n"
302 296 
 msgstr ""
303 297
304 
-#: clamav-milter.c:1429
298 
+#: clamav-milter.c:1428
305 299 
 #, c-format
306 300 
 msgid "%s: smfi_setconn failed\n"
307 301 
 msgstr ""
308 302
309 
-#: clamav-milter.c:1442
303 
+#: clamav-milter.c:1441
310 304 
 #, c-format
311 305 
 msgid "Started: %s"
312 306 
 msgstr ""
313 307
314 
-#: clamav-milter.c:1479 clamav-milter.c:1708
308 
+#: clamav-milter.c:1478 clamav-milter.c:1707
315 309 
 #, c-format
316 310 
 msgid "Check clamd server %s - it may be down\n"
317 311 
 msgstr ""
318 312
319 
-#: clamav-milter.c:1640
313 
+#: clamav-milter.c:1639
320 314 
 msgid "No free clamd sessions\n"
321 315 
 msgstr ""
322 316
323 
-#: clamav-milter.c:1711
317 
+#: clamav-milter.c:1710
324 318 
 #, c-format
325 319 
 msgid "Check clamd server %s - it may be down"
326 320 
 msgstr ""
327 321
328 
-#: clamav-milter.c:1750
322 
+#: clamav-milter.c:1749
329 323 
 msgid "findServer: select failed"
330 324 
 msgstr ""
331 325
332 
-#: clamav-milter.c:1759
326 
+#: clamav-milter.c:1758
333 327 
 #, c-format
334 328 
 msgid "findServer: using server %d\n"
335 329 
 msgstr ""
336 330
337 
-#: clamav-milter.c:1764
331 
+#: clamav-milter.c:1763
338 332 
 msgid "findServer: No response from any server\n"
339 333 
 msgstr ""
340 334
341 
-#: clamav-milter.c:1766
335 
+#: clamav-milter.c:1765
342 336 
 msgid "findServer: No response from any server"
343 337 
 msgstr ""
344 338
345 
-#: clamav-milter.c:1784
339 
+#: clamav-milter.c:1783
346 340 
 msgid "clamfi_connect: ctx is null"
347 341 
 msgstr ""
348 342
349 
-#: clamav-milter.c:1789
343 
+#: clamav-milter.c:1788
350 344 
 msgid "clamfi_connect: hostname is null"
351 345 
 msgstr ""
352 346
353 
-#: clamav-milter.c:1810
347 
+#: clamav-milter.c:1809
354 348 
 msgid "clamfi_connect: remoteIP is null"
355 349 
 msgstr ""
356 350
357 
-#: clamav-milter.c:1818
351 
+#: clamav-milter.c:1817
358 352 
 #, c-format
359 353 
 msgid "clamfi_connect: connection from %s [%s]"
360 354 
 msgstr ""
361 355
362 
-#: clamav-milter.c:1819
356 
+#: clamav-milter.c:1818
363 357 
 #, c-format
364 358 
 msgid "clamfi_connect: connection from %s [%s]\n"
365 359 
 msgstr ""
366 360
367 
-#: clamav-milter.c:1838
361 
+#: clamav-milter.c:1837
368 362 
 msgid "Can't get sendmail hostname"
369 363 
 msgstr ""
370 364
371 
-#: clamav-milter.c:1843
365 
+#: clamav-milter.c:1842
372 366 
 #, c-format
373 367 
 msgid "Access Denied: Host Unknown (%s)"
374 368 
 msgstr ""
375 369
376 
-#: clamav-milter.c:1853
370 
+#: clamav-milter.c:1852
377 371 
 #, c-format
378 372 
 msgid "Access Denied: Can't get IP address for (%s)"
379 373 
 msgstr ""
380 374
381 
-#: clamav-milter.c:1870
375 
+#: clamav-milter.c:1869
382 376 
 #, c-format
383 377 
 msgid "Access Denied for %s[%s]"
384 378 
 msgstr ""
385 379
386 
-#: clamav-milter.c:1888
380 
+#: clamav-milter.c:1887
387 381 
 msgid "clamfi_connect: not scanning outgoing messages"
388 382 
 msgstr ""
389 383
390 
-#: clamav-milter.c:1889
384 
+#: clamav-milter.c:1888
391 385 
 msgid "clamfi_connect: not scanning outgoing messages\n"
392 386 
 msgstr ""
393 387
394 
-#: clamav-milter.c:1897
388 
+#: clamav-milter.c:1896
395 389 
 msgid "clamfi_connect: not scanning local messages"
396 390 
 msgstr ""
397 391
398 
-#: clamav-milter.c:1898
392 
+#: clamav-milter.c:1897
399 393 
 msgid "clamfi_connect: not scanning local messages\n"
400 394 
 msgstr ""
401 395
402 
-#: clamav-milter.c:1932
396 
+#: clamav-milter.c:1931
403 397 
 #, c-format
404 398 
 msgid "hit max-children limit (%u >= %u)\n"
405 399 
 msgstr ""
406 400
407 
-#: clamav-milter.c:1933
401 
+#: clamav-milter.c:1932
408 402 
 #, c-format
409 403 
 msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"
410 404 
 msgstr ""
411 405
412 
-#: clamav-milter.c:1939
406 
+#: clamav-milter.c:1938
413 407 
 #, c-format
414 408 
 msgid "hit max-children limit (%u >= %u)"
415 409 
 msgstr ""
416 410
417 
-#: clamav-milter.c:1940
411 
+#: clamav-milter.c:1939
418 412 
 #, c-format
419 413 
 msgid "hit max-children limit (%u >= %u): waiting for some to exit"
420 414 
 msgstr ""
421 415
422 
-#: clamav-milter.c:1945
416 
+#: clamav-milter.c:1944
423 417 
 msgid "AV system temporarily overloaded - please try later"
424 418 
 msgstr ""
425 419
426 
-#: clamav-milter.c:1975
420 
+#: clamav-milter.c:1974
427 421 
 #, c-format
428 422 
 msgid ">n_children = %d\n"
429 423 
 msgstr ""
430 424
431 
-#: clamav-milter.c:1981
425 
+#: clamav-milter.c:1980
432 426 
 msgid "Timeout waiting for a child to die"
433 427 
 msgstr ""
434 428
435 
-#: clamav-milter.c:1983
429 
+#: clamav-milter.c:1982
436 430 
 msgid "Timeout waiting for a child to die\n"
437 431 
 msgstr ""
438 432
439 
-#: clamav-milter.c:2102
433 
+#: clamav-milter.c:2101
440 434 
 msgid "clamfi_eoh"
441 435 
 msgstr ""
442 436
443 
-#: clamav-milter.c:2105
437 
+#: clamav-milter.c:2104
444 438 
 msgid "clamfi_eoh\n"
445 439 
 msgstr ""
446 440
447 
-#: clamav-milter.c:2162
441 
+#: clamav-milter.c:2161
448 442 
 msgid "clamfi_eoh: ignoring whitelisted message"
449 443 
 msgstr ""
450 444
451 
-#: clamav-milter.c:2164
445 
+#: clamav-milter.c:2163
452 446 
 msgid "clamfi_eoh: not scanning outgoing messages\n"
453 447 
 msgstr ""
454 448
455 
-#: clamav-milter.c:2178
449 
+#: clamav-milter.c:2177
456 450 
 #, c-format
457 451 
 msgid "clamfi_envbody: %u bytes"
458 452 
 msgstr ""
459 453
460 
-#: clamav-milter.c:2180
454 
+#: clamav-milter.c:2179
461 455 
 #, c-format
462 456 
 msgid "clamfi_envbody: %u bytes\n"
463 457 
 msgstr ""
464 458
465 
-#: clamav-milter.c:2190 clamav-milter.c:2381
459 
+#: clamav-milter.c:2189 clamav-milter.c:2380
466 460 
 #, c-format
467 461 
 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"
468 462 
 msgstr ""
469 463
470 
-#: clamav-milter.c:2194 clamav-milter.c:2384
464 
+#: clamav-milter.c:2193 clamav-milter.c:2383
471 465 
 msgid "Not Scanned - StreamMaxLength exceeded"
472 466 
 msgstr ""
473 467
474 
-#: clamav-milter.c:2266 clamav-milter.c:2284 clamav-milter.c:3260
475 
-#: clamav-milter.c:3267
468 
+#: clamav-milter.c:2265 clamav-milter.c:2283 clamav-milter.c:3259
469 
+#: clamav-milter.c:3266
476 470 
 msgid "send failed to clamd"
477 471 
 msgstr ""
478 472
479 
-#: clamav-milter.c:2301
473 
+#: clamav-milter.c:2300
480 474 
 #, c-format
481 475 
 msgid "clamfi_eom: read %s"
482 476 
 msgstr ""
483 477
484 
-#: clamav-milter.c:2302
478 
+#: clamav-milter.c:2301
485 479 
 #, c-format
486 480 
 msgid "clamfi_eom: read %s\n"
487 481 
 msgstr ""
488 482
489 
-#: clamav-milter.c:2310
483 
+#: clamav-milter.c:2309
490 484 
 msgid "clamfi_eom: read nothing from clamd"
491 485 
 msgstr ""
492 486
493 
-#: clamav-milter.c:2312
487 
+#: clamav-milter.c:2311
494 488 
 msgid "clamfi_eom: read nothing from clamd\n"
495 489 
 msgstr ""
496 490
497 
-#: clamav-milter.c:2347 clamav-milter.c:2370
491 
+#: clamav-milter.c:2346 clamav-milter.c:2369
498 492 
 msgid "Error determining host"
499 493 
 msgstr ""
500 494
501 
-#: clamav-milter.c:2389
495 
+#: clamav-milter.c:2388
502 496 
 msgid "Not Scanned"
503 497 
 msgstr ""
504 498
505 
-#: clamav-milter.c:2400
499 
+#: clamav-milter.c:2399
506 500 
 msgid "Clean"
507 501 
 msgstr ""
508 502
509 
-#: clamav-milter.c:2404
503 
+#: clamav-milter.c:2403
510 504 
 #, c-format
511 505 
 msgid "%s: clean message from %s"
512 506 
 msgstr ""
513 507
514 
-#: clamav-milter.c:2406
508 
+#: clamav-milter.c:2405
515 509 
 msgid "an unknown sender"
516 510 
 msgstr ""
517 511
518 
-#: clamav-milter.c:2440
512 
+#: clamav-milter.c:2439
519 513 
 msgid "Infected"
520 514 
 msgstr ""
521 515
522 
-#: clamav-milter.c:2458
516 
+#: clamav-milter.c:2457
523 517 
 #, c-format
524 518 
 msgid "Intercepted virus from %s to"
525 519 
 msgstr ""
526 520
527 
-#: clamav-milter.c:2549
521 
+#: clamav-milter.c:2548
528 522 
 msgid ""
529 523 
 "Subject: Virus intercepted\n"
530 524 
 "\n"
531 525 
 msgstr ""
532 526
533 
-#: clamav-milter.c:2571
527 
+#: clamav-milter.c:2570
534 528 
 msgid "A message you sent to\n"
535 529 
 msgstr ""
536 530
537 
-#: clamav-milter.c:2578
531 
+#: clamav-milter.c:2577
538 532 
 #, c-format
539 533 
 msgid "The message %1$s sent from %2$s to\n"
540 534 
 msgstr ""
541 535
542 
-#: clamav-milter.c:2581
536 
+#: clamav-milter.c:2580
543 537 
 #, c-format
544 538 
 msgid "A message sent from %s to\n"
545 539 
 msgstr ""
546 540
547 
-#: clamav-milter.c:2586
541 
+#: clamav-milter.c:2585
548 542 
 #, c-format
549 543 
 msgid "contained %s and has not been delivered.\n"
550 544 
 msgstr ""
551 545
552 
-#: clamav-milter.c:2590
546 
+#: clamav-milter.c:2589
553 547 
 #, c-format
554 548 
 msgid ""
555 549 
 "\n"
556 550 
 "The message in question has been quarantined as %s\n"
557 551 
 msgstr ""
558 552
559 
-#: clamav-milter.c:2593
553 
+#: clamav-milter.c:2592
560 554 
 #, c-format
561 555 
 msgid ""
562 556 
 "\n"
... ... 
@@ -564,13 +558,13 @@ msgid ""
564 564 
 "\n"
565 565 
 msgstr ""
566 566
567 
-#: clamav-milter.c:2596
567 
+#: clamav-milter.c:2595
568 568 
 msgid ""
569 569 
 "For your information, the original message headers were:\n"
570 570 
 "\n"
571 571 
 msgstr ""
572 572
573 
-#: clamav-milter.c:2609
573 
+#: clamav-milter.c:2608
574 574 
 #, c-format
575 575 
 msgid ""
576 576 
 "\n"
... ... 
@@ -578,119 +572,119 @@ msgid ""
578 578 
 "%s\t\n"
579 579 
 msgstr ""
580 580
581 
-#: clamav-milter.c:2622
581 
+#: clamav-milter.c:2621
582 582 
 #, c-format
583 583 
 msgid "Quarantined infected mail as %s"
584 584 
 msgstr ""
585 585
586 
-#: clamav-milter.c:2646
586 
+#: clamav-milter.c:2645
587 587 
 #, c-format
588 588 
 msgid "Can't set quarantine user %s"
589 589 
 msgstr ""
590 590
591 
-#: clamav-milter.c:2648
591 
+#: clamav-milter.c:2647
592 592 
 #, c-format
593 593 
 msgid "Can't set quarantine user %s\n"
594 594 
 msgstr ""
595 595
596 
-#: clamav-milter.c:2661
596 
+#: clamav-milter.c:2660
597 597 
 #, c-format
598 598 
 msgid "%s detected by ClamAV - http://www.clamav.net"
599 599 
 msgstr ""
600 600
601 
-#: clamav-milter.c:2741
601 
+#: clamav-milter.c:2740
602 602 
 #, c-format
603 603 
 msgid "Can't remove clean file %s"
604 604 
 msgstr ""
605 605
606 
-#: clamav-milter.c:2905 clamav-milter.c:2908
606 
+#: clamav-milter.c:2904 clamav-milter.c:2907
607 607 
 #, c-format
608 608 
 msgid "write failure (%u bytes) to %s: %s"
609 609 
 msgstr ""
610 610
611 
-#: clamav-milter.c:2922 clamav-milter.c:2925
611 
+#: clamav-milter.c:2921 clamav-milter.c:2924
612 612 
 #, c-format
613 613 
 msgid "write failure (%u bytes) to clamd: %s"
614 614 
 msgstr ""
615 615
616 
-#: clamav-milter.c:2991
616 
+#: clamav-milter.c:2990
617 617 
 #, c-format
618 618 
 msgid "No data received from clamd in %d seconds\n"
619 619 
 msgstr ""
620 620
621 
-#: clamav-milter.c:3013
621 
+#: clamav-milter.c:3012
622 622 
 #, c-format
623 623 
 msgid "Can't stat %s"
624 624 
 msgstr ""
625 625
626 
-#: clamav-milter.c:3024 clamav-milter.c:3402
626 
+#: clamav-milter.c:3023 clamav-milter.c:3401
627 627 
 #, c-format
628 628 
 msgid "Can't open %s"
629 629 
 msgstr ""
630 630
631 
-#: clamav-milter.c:3159
631 
+#: clamav-milter.c:3158
632 632 
 #, c-format
633 633 
 msgid "mkdir %s failed"
634 634 
 msgstr ""
635 635
636 
-#: clamav-milter.c:3172
636 
+#: clamav-milter.c:3171
637 637 
 #, c-format
638 638 
 msgid "mktemp %s failed"
639 639 
 msgstr ""
640 640
641 
-#: clamav-milter.c:3182
641 
+#: clamav-milter.c:3181
642 642 
 #, c-format
643 643 
 msgid "Temporary quarantine file %s creation failed"
644 644 
 msgstr ""
645 645
646 
-#: clamav-milter.c:3279
646 
+#: clamav-milter.c:3278
647 647 
 msgid "failed to create TCPSocket to talk to clamd"
648 648 
 msgstr ""
649 649
650 
-#: clamav-milter.c:3293
650 
+#: clamav-milter.c:3292
651 651 
 msgid "recv failed from clamd getting PORT"
652 652 
 msgstr ""
653 653
654 
-#: clamav-milter.c:3303
654 
+#: clamav-milter.c:3302
655 655 
 #, c-format
656 656 
 msgid "Expected port information from clamd, got '%s'"
657 657 
 msgstr ""
658 658
659 
-#: clamav-milter.c:3306
659 
+#: clamav-milter.c:3305
660 660 
 #, c-format
661 661 
 msgid "Expected port information from clamd, got '%s'\n"
662 662 
 msgstr ""
663 663
664 
-#: clamav-milter.c:3321
664 
+#: clamav-milter.c:3320
665 665 
 #, c-format
666 666 
 msgid "Connecting to local port %d\n"
667 667 
 msgstr ""
668 668
669 
-#: clamav-milter.c:3332 clamav-milter.c:3335
669 
+#: clamav-milter.c:3331 clamav-milter.c:3334
670 670 
 #, c-format
671 671 
 msgid "Failed to connect to port %d given by clamd: %s"
672 672 
 msgstr ""
673 673
674 
-#: clamav-milter.c:3414
674 
+#: clamav-milter.c:3413
675 675 
 #, c-format
676 676 
 msgid "Clamd (pid %d) seems to have died"
677 677 
 msgstr ""
678 678
679 
-#: clamav-milter.c:3440
679 
+#: clamav-milter.c:3439
680 680 
 #, c-format
681 681 
 msgid "Can't open e-mail template file %s"
682 682 
 msgstr ""
683 683
684 
-#: clamav-milter.c:3449
684 
+#: clamav-milter.c:3448
685 685 
 #, c-format
686 686 
 msgid "Can't stat e-mail template file %s"
687 687 
 msgstr ""
688 688
689 
-#: clamav-milter.c:3458
689 
+#: clamav-milter.c:3457
690 690 
 msgid "Out of memory"
691 691 
 msgstr ""
692 692
693 
-#: clamav-milter.c:3485
693 
+#: clamav-milter.c:3484
694 694 
 #, c-format
695 695 
 msgid "%s: Unknown clamAV variable \"%c\"\n"
696 696 
 msgstr ""
... ... 
@@ -705,44 +699,44 @@ msgstr ""
705 705 
 msgid "%s: Unknown sendmail variable \"%s\"\n"
706 706 
 msgstr ""
707 707
708 
-#: clamav-milter.c:3568
708 
+#: clamav-milter.c:3569
709 709 
 #, c-format
710 710 
 msgid "Can't rename %1$s to %2$s"
711 711 
 msgstr ""
712 712
713 
-#: clamav-milter.c:3590
713 
+#: clamav-milter.c:3591
714 714 
 #, c-format
715 715 
 msgid "[Virus] %s"
716 716 
 msgstr ""
717 717
718 
-#: clamav-milter.c:3680
718 
+#: clamav-milter.c:3681
719 719 
 msgid ""
720 720 
 "No response from any clamd server - your AV system is not scanning emails\n"
721 721 
 msgstr ""
722 722
723 
-#: clamav-milter.c:3683
723 
+#: clamav-milter.c:3684
724 724 
 msgid ""
725 725 
 "No response from any clamd server - your AV system is not scanning emails"
726 726 
 msgstr ""
727 727
728 
-#: clamav-milter.c:3701
728 
+#: clamav-milter.c:3702
729 729 
 msgid "Subject: ClamAV Down\n"
730 730 
 msgstr ""
731 731
732 
-#: clamav-milter.c:3704
732 
+#: clamav-milter.c:3705
733 733 
 msgid ""
734 734 
 "This is an automatic message\n"
735 735 
 "\n"
736 736 
 msgstr ""
737 737
738 
-#: clamav-milter.c:3707
738 
+#: clamav-milter.c:3708
739 739 
 msgid "The clamd program cannot be contacted.\n"
740 740 
 msgstr ""
741 741
742 
-#: clamav-milter.c:3709
742 
+#: clamav-milter.c:3710
743 743 
 msgid "No clamd server can be contacted.\n"
744 744 
 msgstr ""
745 745
746 
-#: clamav-milter.c:3711
746 
+#: clamav-milter.c:3712
747 747 
 msgid "Emails may not be being scanned, please check your servers.\n"
748 748 
 msgstr ""