git-svn: trunk@1605
Nigel Horne authored on 2005/06/05 14:59:39... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Sun Jun 5 06:58:45 BST 2005 (njh) |
|
2 |
+---------------------------------- |
|
3 |
+ * clamav-milter: Better error message if the white-list file can't be |
|
4 |
+ opened |
|
5 |
+ |
|
1 | 6 |
Thu Jun 2 20:04:04 CEST 2005 (tk) |
2 | 7 |
---------------------------------- |
3 | 8 |
* libclamav: remove support for CL_SCAN_DISABLERAR (RAR unpacker is now |
... | ... |
@@ -6,7 +11,7 @@ Thu Jun 2 20:04:04 CEST 2005 (tk) |
6 | 6 |
Thu Jun 2 08:56:39 BST 2005 (njh) |
7 | 7 |
---------------------------------- |
8 | 8 |
* libclamav/pdf.c: Handle ascii85encoded streams that are full of z's. |
9 |
- Reported by "Kevin Heneveld" <kevin at |
|
9 |
+ Reported by "Kevin Heneveld" <kevin at |
|
10 | 10 |
northstar.k12.ak.us> |
11 | 11 |
|
12 | 12 |
Wed Jun 1 17:20:07 BST 2005 (njh) |
... | ... |
@@ -818,6 +818,11 @@ Changes |
818 | 818 |
clamav-milter to become idle then reloading the |
819 | 819 |
database |
820 | 820 |
0.85f 1/6/05: Support the new configuration functions |
821 |
+0.85g 4/6/05: When checking if an email address is in the white-list, |
|
822 |
+ check if it is the quarantine email address |
|
823 |
+ before checking against the white-list file |
|
824 |
+ When starting, check that the white-list file can be |
|
825 |
+ opened |
|
821 | 826 |
|
822 | 827 |
4. INTERNATIONALISATION |
823 | 828 |
|
... | ... |
@@ -22,9 +22,9 @@ |
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.210 2005/06/02 07:42:46 nigelhorne Exp $"; |
|
25 |
+static char const rcsid[] = "$Id: clamav-milter.c,v 1.211 2005/06/05 05:57:52 nigelhorne Exp $"; |
|
26 | 26 |
|
27 |
-#define CM_VERSION "0.85f" |
|
27 |
+#define CM_VERSION "0.85g" |
|
28 | 28 |
|
29 | 29 |
#if HAVE_CONFIG_H |
30 | 30 |
#include "clamav-config.h" |
... | ... |
@@ -1020,6 +1020,10 @@ main(int argc, char **argv) |
1020 | 1020 |
perror(templatefile); |
1021 | 1021 |
return EX_CONFIG; |
1022 | 1022 |
} |
1023 |
+ if(whitelistFile && (access(whitelistFile, R_OK) < 0)) { |
|
1024 |
+ perror(templatefile); |
|
1025 |
+ return EX_CONFIG; |
|
1026 |
+ } |
|
1023 | 1027 |
|
1024 | 1028 |
/* |
1025 | 1029 |
* patch from "Richard G. Roberto" <rgr@dedlegend.com> |
... | ... |
@@ -4989,6 +4993,14 @@ isWhitelisted(const char *emailaddress) |
4989 | 4989 |
{ |
4990 | 4990 |
static table_t *whitelist; |
4991 | 4991 |
|
4992 |
+ cli_dbgmsg("isWhitelisted %s\n", emailaddress); |
|
4993 |
+ |
|
4994 |
+ /* |
|
4995 |
+ * Don't scan messages to the quarantine email address |
|
4996 |
+ */ |
|
4997 |
+ if(quarantine && (strcasecmp(quarantine, emailaddress) == 0)) |
|
4998 |
+ return 1; |
|
4999 |
+ |
|
4992 | 5000 |
if((whitelist == NULL) && whitelistFile) { |
4993 | 5001 |
FILE *fin; |
4994 | 5002 |
char buf[BUFSIZ + 1]; |
... | ... |
@@ -4997,6 +5009,9 @@ isWhitelisted(const char *emailaddress) |
4997 | 4997 |
|
4998 | 4998 |
if(fin == NULL) { |
4999 | 4999 |
perror(whitelistFile); |
5000 |
+ if(use_syslog) |
|
5001 |
+ syslog(LOG_ERR, _("Can't open white-list file %s"), |
|
5002 |
+ whitelistFile); |
|
5000 | 5003 |
return 0; |
5001 | 5004 |
} |
5002 | 5005 |
whitelist = tableCreate(); |
... | ... |
@@ -5020,12 +5035,6 @@ isWhitelisted(const char *emailaddress) |
5020 | 5020 |
*/ |
5021 | 5021 |
return 1; |
5022 | 5022 |
|
5023 |
- /* |
|
5024 |
- * Don't scan messages to the quarantine email address |
|
5025 |
- */ |
|
5026 |
- if(quarantine && (strcasecmp(quarantine, emailaddress) == 0)) |
|
5027 |
- return 1; |
|
5028 |
- |
|
5029 | 5023 |
return 0; |
5030 | 5024 |
} |
5031 | 5025 |
|
... | ... |
@@ -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-05-19 10:31+0100\n" |
|
11 |
+"POT-Creation-Date: 2005-06-05 06:38+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,727 +16,727 @@ msgstr "" |
16 | 16 |
"Content-Type: text/plain; charset=CHARSET\n" |
17 | 17 |
"Content-Transfer-Encoding: 8bit\n" |
18 | 18 |
|
19 |
-#: clamav-milter.c:469 |
|
19 |
+#: clamav-milter.c:468 |
|
20 | 20 |
msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them." |
21 | 21 |
msgstr "" |
22 | 22 |
|
23 |
-#: clamav-milter.c:470 |
|
23 |
+#: clamav-milter.c:469 |
|
24 | 24 |
msgid "\t--bounce\t\t-b\tSend a failure message to the sender." |
25 | 25 |
msgstr "" |
26 | 26 |
|
27 |
-#: clamav-milter.c:471 |
|
27 |
+#: clamav-milter.c:470 |
|
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:472 |
|
33 |
+#: clamav-milter.c:471 |
|
34 | 34 |
msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE." |
35 | 35 |
msgstr "" |
36 | 36 |
|
37 |
-#: clamav-milter.c:473 |
|
37 |
+#: clamav-milter.c:472 |
|
38 | 38 |
msgid "\t--debug\t\t\t-D\tPrint debug messages." |
39 | 39 |
msgstr "" |
40 | 40 |
|
41 |
-#: clamav-milter.c:474 |
|
41 |
+#: clamav-milter.c:473 |
|
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:475 |
|
46 |
+#: clamav-milter.c:474 |
|
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:476 |
|
51 |
+#: clamav-milter.c:475 |
|
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:477 |
|
57 |
+#: clamav-milter.c:476 |
|
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:478 |
|
61 |
+#: clamav-milter.c:477 |
|
62 | 62 |
msgid "\t--external\t\t-e\tUse an external scanner (usually clamd)." |
63 | 63 |
msgstr "" |
64 | 64 |
|
65 |
-#: clamav-milter.c:479 |
|
65 |
+#: clamav-milter.c:478 |
|
66 | 66 |
msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here." |
67 | 67 |
msgstr "" |
68 | 68 |
|
69 |
-#: clamav-milter.c:480 |
|
69 |
+#: clamav-milter.c:479 |
|
70 | 70 |
msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)." |
71 | 71 |
msgstr "" |
72 | 72 |
|
73 |
-#: clamav-milter.c:481 |
|
73 |
+#: clamav-milter.c:480 |
|
74 | 74 |
msgid "\t--help\t\t\t-h\tThis message." |
75 | 75 |
msgstr "" |
76 | 76 |
|
77 |
-#: clamav-milter.c:482 |
|
77 |
+#: clamav-milter.c:481 |
|
78 | 78 |
msgid "\t--headers\t\t-H\tInclude original message headers in the report." |
79 | 79 |
msgstr "" |
80 | 80 |
|
81 |
-#: clamav-milter.c:483 |
|
81 |
+#: clamav-milter.c:482 |
|
82 | 82 |
msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN." |
83 | 83 |
msgstr "" |
84 | 84 |
|
85 |
-#: clamav-milter.c:484 |
|
85 |
+#: clamav-milter.c:483 |
|
86 | 86 |
msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans." |
87 | 87 |
msgstr "" |
88 | 88 |
|
89 |
-#: clamav-milter.c:485 |
|
89 |
+#: clamav-milter.c:484 |
|
90 | 90 |
msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine." |
91 | 91 |
msgstr "" |
92 | 92 |
|
93 |
-#: clamav-milter.c:486 |
|
93 |
+#: clamav-milter.c:485 |
|
94 | 94 |
msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away." |
95 | 95 |
msgstr "" |
96 | 96 |
|
97 |
-#: clamav-milter.c:487 |
|
97 |
+#: clamav-milter.c:486 |
|
98 | 98 |
msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers." |
99 | 99 |
msgstr "" |
100 | 100 |
|
101 |
-#: clamav-milter.c:488 |
|
101 |
+#: clamav-milter.c:487 |
|
102 | 102 |
msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile." |
103 | 103 |
msgstr "" |
104 | 104 |
|
105 |
-#: clamav-milter.c:489 |
|
105 |
+#: clamav-milter.c:488 |
|
106 | 106 |
msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]." |
107 | 107 |
msgstr "" |
108 | 108 |
|
109 |
-#: clamav-milter.c:490 |
|
109 |
+#: clamav-milter.c:489 |
|
110 | 110 |
msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster." |
111 | 111 |
msgstr "" |
112 | 112 |
|
113 |
-#: clamav-milter.c:491 |
|
113 |
+#: clamav-milter.c:490 |
|
114 | 114 |
msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions." |
115 | 115 |
msgstr "" |
116 | 116 |
|
117 |
-#: clamav-milter.c:492 |
|
117 |
+#: clamav-milter.c:491 |
|
118 | 118 |
msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account." |
119 | 119 |
msgstr "" |
120 | 120 |
|
121 |
-#: clamav-milter.c:493 |
|
121 |
+#: clamav-milter.c:492 |
|
122 | 122 |
msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails." |
123 | 123 |
msgstr "" |
124 | 124 |
|
125 |
-#: clamav-milter.c:494 |
|
125 |
+#: clamav-milter.c:493 |
|
126 | 126 |
msgid "" |
127 | 127 |
"\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running " |
128 | 128 |
"clamd (when using TCPsocket)." |
129 | 129 |
msgstr "" |
130 | 130 |
|
131 |
-#: clamav-milter.c:495 |
|
131 |
+#: clamav-milter.c:494 |
|
132 | 132 |
msgid "\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify" |
133 | 133 |
msgstr "" |
134 | 134 |
|
135 |
-#: clamav-milter.c:496 |
|
135 |
+#: clamav-milter.c:495 |
|
136 | 136 |
msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message." |
137 | 137 |
msgstr "" |
138 | 138 |
|
139 |
-#: clamav-milter.c:497 |
|
139 |
+#: clamav-milter.c:496 |
|
140 | 140 |
msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file." |
141 | 141 |
msgstr "" |
142 | 142 |
|
143 |
-#: clamav-milter.c:498 |
|
143 |
+#: clamav-milter.c:497 |
|
144 | 144 |
msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file." |
145 | 145 |
msgstr "" |
146 | 146 |
|
147 |
-#: clamav-milter.c:499 |
|
147 |
+#: clamav-milter.c:498 |
|
148 | 148 |
msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die." |
149 | 149 |
msgstr "" |
150 | 150 |
|
151 |
-#: clamav-milter.c:500 |
|
151 |
+#: clamav-milter.c:499 |
|
152 | 152 |
msgid "" |
153 | 153 |
"\t--whitelist-file=FILE\t-W FILE\tLocation of the file of whitelisted " |
154 | 154 |
"addresses" |
155 | 155 |
msgstr "" |
156 | 156 |
|
157 |
-#: clamav-milter.c:501 |
|
157 |
+#: clamav-milter.c:500 |
|
158 | 158 |
msgid "\t--version\t\t-V\tPrint the version number of this software." |
159 | 159 |
msgstr "" |
160 | 160 |
|
161 |
-#: clamav-milter.c:503 |
|
161 |
+#: clamav-milter.c:502 |
|
162 | 162 |
msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'." |
163 | 163 |
msgstr "" |
164 | 164 |
|
165 |
-#: clamav-milter.c:505 |
|
165 |
+#: clamav-milter.c:504 |
|
166 | 166 |
msgid "" |
167 | 167 |
"\n" |
168 | 168 |
"For more information type \"man clamav-milter\"." |
169 | 169 |
msgstr "" |
170 | 170 |
|
171 |
-#: clamav-milter.c:506 |
|
171 |
+#: clamav-milter.c:505 |
|
172 | 172 |
msgid "Report bugs to bugs@clamav.net." |
173 | 173 |
msgstr "" |
174 | 174 |
|
175 |
-#: clamav-milter.c:823 |
|
175 |
+#: clamav-milter.c:828 |
|
176 | 176 |
#, c-format |
177 | 177 |
msgid "%s: No socket-addr given\n" |
178 | 178 |
msgstr "" |
179 | 179 |
|
180 |
-#: clamav-milter.c:829 |
|
180 |
+#: clamav-milter.c:834 |
|
181 | 181 |
#, c-format |
182 | 182 |
msgid "%s: socket-addr (%s) doesn't agree with sendmail.cf\n" |
183 | 183 |
msgstr "" |
184 | 184 |
|
185 |
-#: clamav-milter.c:844 |
|
185 |
+#: clamav-milter.c:849 |
|
186 | 186 |
#, c-format |
187 | 187 |
msgid "%s: when using inet: connection to sendmail you must enable --local\n" |
188 | 188 |
msgstr "" |
189 | 189 |
|
190 |
-#: clamav-milter.c:852 |
|
190 |
+#: clamav-milter.c:861 |
|
191 | 191 |
#, c-format |
192 | 192 |
msgid "%s: Can't parse the config file %s\n" |
193 | 193 |
msgstr "" |
194 | 194 |
|
195 |
-#: clamav-milter.c:859 |
|
195 |
+#: clamav-milter.c:868 |
|
196 | 196 |
#, c-format |
197 | 197 |
msgid "%s: --detect-forged-local-addresses is not compatible with --outgoing\n" |
198 | 198 |
msgstr "" |
199 | 199 |
|
200 |
-#: clamav-milter.c:863 |
|
200 |
+#: clamav-milter.c:872 |
|
201 | 201 |
#, c-format |
202 | 202 |
msgid "%s: --detect-forged-local-addresses is not compatible with --local\n" |
203 | 203 |
msgstr "" |
204 | 204 |
|
205 |
-#: clamav-milter.c:867 |
|
205 |
+#: clamav-milter.c:876 |
|
206 | 206 |
#, c-format |
207 | 207 |
msgid "%s: --detect-forged-local-addresses is not compatible with --force\n" |
208 | 208 |
msgstr "" |
209 | 209 |
|
210 |
-#: clamav-milter.c:911 |
|
210 |
+#: clamav-milter.c:920 |
|
211 | 211 |
#, c-format |
212 | 212 |
msgid "" |
213 | 213 |
"%s: The iface option to --broadcast is not supported on your operating " |
214 | 214 |
"system\n" |
215 | 215 |
msgstr "" |
216 | 216 |
|
217 |
-#: clamav-milter.c:920 |
|
217 |
+#: clamav-milter.c:929 |
|
218 | 218 |
#, c-format |
219 | 219 |
msgid "%s: Can't get information about user %s\n" |
220 | 220 |
msgstr "" |
221 | 221 |
|
222 |
-#: clamav-milter.c:931 |
|
222 |
+#: clamav-milter.c:940 |
|
223 | 223 |
#, c-format |
224 | 224 |
msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n" |
225 | 225 |
msgstr "" |
226 | 226 |
|
227 |
-#: clamav-milter.c:948 |
|
227 |
+#: clamav-milter.c:957 |
|
228 | 228 |
#, c-format |
229 | 229 |
msgid "Running as user %s (UID %d, GID %d)\n" |
230 | 230 |
msgstr "" |
231 | 231 |
|
232 |
-#: clamav-milter.c:951 |
|
232 |
+#: clamav-milter.c:960 |
|
233 | 233 |
#, c-format |
234 | 234 |
msgid "%s: running as root is not recommended (check \"User\" in %s)\n" |
235 | 235 |
msgstr "" |
236 | 236 |
|
237 |
-#: clamav-milter.c:953 |
|
237 |
+#: clamav-milter.c:962 |
|
238 | 238 |
#, c-format |
239 | 239 |
msgid "%s: Only root can set an interface for --broadcast\n" |
240 | 240 |
msgstr "" |
241 | 241 |
|
242 |
-#: clamav-milter.c:958 |
|
242 |
+#: clamav-milter.c:967 |
|
243 | 243 |
#, c-format |
244 | 244 |
msgid "%s: Advisory mode doesn't work with quarantine mode\n" |
245 | 245 |
msgstr "" |
246 | 246 |
|
247 |
-#: clamav-milter.c:966 |
|
247 |
+#: clamav-milter.c:975 |
|
248 | 248 |
#, c-format |
249 | 249 |
msgid "%s: Advisory mode doesn't work with quarantine directories\n" |
250 | 250 |
msgstr "" |
251 | 251 |
|
252 |
-#: clamav-milter.c:972 |
|
252 |
+#: clamav-milter.c:981 |
|
253 | 253 |
#, c-format |
254 | 254 |
msgid "%s: the quarantine directory must not contain the string 'ERROR'\n" |
255 | 255 |
msgstr "" |
256 | 256 |
|
257 |
-#: clamav-milter.c:978 |
|
257 |
+#: clamav-milter.c:987 |
|
258 | 258 |
#, c-format |
259 | 259 |
msgid "%s: the quarantine directory must not contain the string 'FOUND'\n" |
260 | 260 |
msgstr "" |
261 | 261 |
|
262 |
-#: clamav-milter.c:984 |
|
262 |
+#: clamav-milter.c:993 |
|
263 | 263 |
#, c-format |
264 | 264 |
msgid "%s: the quarantine directory must not contain the string 'OK'\n" |
265 | 265 |
msgstr "" |
266 | 266 |
|
267 |
-#: clamav-milter.c:1001 |
|
267 |
+#: clamav-milter.c:1010 |
|
268 | 268 |
#, c-format |
269 | 269 |
msgid "%s: insecure quarantine directory %s (mode 0%o)\n" |
270 | 270 |
msgstr "" |
271 | 271 |
|
272 |
-#: clamav-milter.c:1027 |
|
272 |
+#: clamav-milter.c:1040 |
|
273 | 273 |
#, c-format |
274 | 274 |
msgid "%s: ReadTimeout must not be negative in %s\n" |
275 | 275 |
msgstr "" |
276 | 276 |
|
277 |
-#: clamav-milter.c:1035 |
|
277 |
+#: clamav-milter.c:1049 |
|
278 | 278 |
#, c-format |
279 | 279 |
msgid "%s: StreamMaxLength must not be negative in %s\n" |
280 | 280 |
msgstr "" |
281 | 281 |
|
282 |
-#: clamav-milter.c:1064 |
|
282 |
+#: clamav-milter.c:1076 |
|
283 | 283 |
#, c-format |
284 | 284 |
msgid "" |
285 | 285 |
"%s: (-q && !LogSyslog): warning - all interception message methods are off\n" |
286 | 286 |
msgstr "" |
287 | 287 |
|
288 |
-#: clamav-milter.c:1074 |
|
288 |
+#: clamav-milter.c:1086 |
|
289 | 289 |
#, c-format |
290 | 290 |
msgid "%s: --max-children must be given if --external is not given\n" |
291 | 291 |
msgstr "" |
292 | 292 |
|
293 |
-#: clamav-milter.c:1078 |
|
293 |
+#: clamav-milter.c:1090 |
|
294 | 294 |
#, c-format |
295 | 295 |
msgid "%s: --timeout must not be given if --external is not given\n" |
296 | 296 |
msgstr "" |
297 | 297 |
|
298 |
-#: clamav-milter.c:1091 |
|
298 |
+#: clamav-milter.c:1103 |
|
299 | 299 |
#, c-format |
300 | 300 |
msgid "%s: You can select one server type only (local/TCP) in %s\n" |
301 | 301 |
msgstr "" |
302 | 302 |
|
303 |
-#: clamav-milter.c:1101 |
|
303 |
+#: clamav-milter.c:1113 |
|
304 | 304 |
#, c-format |
305 | 305 |
msgid "The connection from sendmail to %s (%s) must not\n" |
306 | 306 |
msgstr "" |
307 | 307 |
|
308 |
-#: clamav-milter.c:1103 |
|
308 |
+#: clamav-milter.c:1115 |
|
309 | 309 |
#, c-format |
310 | 310 |
msgid "be the same as the connection to clamd (%s) in %s\n" |
311 | 311 |
msgstr "" |
312 | 312 |
|
313 |
-#: clamav-milter.c:1113 clamav-milter.c:1136 |
|
313 |
+#: clamav-milter.c:1125 clamav-milter.c:1148 |
|
314 | 314 |
#, c-format |
315 | 315 |
msgid "Can't talk to clamd server via %s\n" |
316 | 316 |
msgstr "" |
317 | 317 |
|
318 |
-#: clamav-milter.c:1115 clamav-milter.c:1138 |
|
318 |
+#: clamav-milter.c:1127 clamav-milter.c:1150 |
|
319 | 319 |
#, c-format |
320 | 320 |
msgid "Check your entry for LocalSocket in %s\n" |
321 | 321 |
msgstr "" |
322 | 322 |
|
323 |
-#: clamav-milter.c:1149 |
|
323 |
+#: clamav-milter.c:1161 |
|
324 | 324 |
msgid "Can't create a clamd session" |
325 | 325 |
msgstr "" |
326 | 326 |
|
327 |
-#: clamav-milter.c:1166 |
|
327 |
+#: clamav-milter.c:1178 |
|
328 | 328 |
#, c-format |
329 | 329 |
msgid "%s: --quarantine-dir not supported for TCPSocket - use --quarantine\n" |
330 | 330 |
msgstr "" |
331 | 331 |
|
332 |
-#: clamav-milter.c:1181 |
|
332 |
+#: clamav-milter.c:1193 |
|
333 | 333 |
#, c-format |
334 | 334 |
msgid "%s: hostname %s is longer than %d characters\n" |
335 | 335 |
msgstr "" |
336 | 336 |
|
337 |
-#: clamav-milter.c:1200 clamav-milter.c:1290 |
|
337 |
+#: clamav-milter.c:1212 clamav-milter.c:1302 |
|
338 | 338 |
#, c-format |
339 | 339 |
msgid "%s: --max-children must be given in sessions mode\n" |
340 | 340 |
msgstr "" |
341 | 341 |
|
342 |
-#: clamav-milter.c:1223 |
|
342 |
+#: clamav-milter.c:1235 |
|
343 | 343 |
#, c-format |
344 | 344 |
msgid "%s: Unknown host %s\n" |
345 | 345 |
msgstr "" |
346 | 346 |
|
347 |
-#: clamav-milter.c:1235 |
|
347 |
+#: clamav-milter.c:1247 |
|
348 | 348 |
#, c-format |
349 | 349 |
msgid "Can't talk to clamd server %s on port %d\n" |
350 | 350 |
msgstr "" |
351 | 351 |
|
352 |
-#: clamav-milter.c:1239 |
|
352 |
+#: clamav-milter.c:1251 |
|
353 | 353 |
#, c-format |
354 | 354 |
msgid "Check the value for TCPAddr in %s\n" |
355 | 355 |
msgstr "" |
356 | 356 |
|
357 |
-#: clamav-milter.c:1241 |
|
357 |
+#: clamav-milter.c:1253 |
|
358 | 358 |
#, c-format |
359 | 359 |
msgid "Check the value for TCPAddr in clamd.conf on %s\n" |
360 | 360 |
msgstr "" |
361 | 361 |
|
362 |
-#: clamav-milter.c:1257 |
|
362 |
+#: clamav-milter.c:1269 |
|
363 | 363 |
msgid "Can't find any active clamd servers\n" |
364 | 364 |
msgstr "" |
365 | 365 |
|
366 |
-#: clamav-milter.c:1258 clamav-milter.c:1264 |
|
366 |
+#: clamav-milter.c:1270 clamav-milter.c:1276 |
|
367 | 367 |
#, c-format |
368 | 368 |
msgid "Check your entry for TCPSocket in %s\n" |
369 | 369 |
msgstr "" |
370 | 370 |
|
371 |
-#: clamav-milter.c:1263 |
|
371 |
+#: clamav-milter.c:1275 |
|
372 | 372 |
msgid "Can't find any clamd servers\n" |
373 | 373 |
msgstr "" |
374 | 374 |
|
375 |
-#: clamav-milter.c:1270 |
|
375 |
+#: clamav-milter.c:1282 |
|
376 | 376 |
#, c-format |
377 | 377 |
msgid "%s: You must select server type (local/TCP) in %s\n" |
378 | 378 |
msgstr "" |
379 | 379 |
|
380 |
-#: clamav-milter.c:1338 |
|
380 |
+#: clamav-milter.c:1350 |
|
381 | 381 |
#, c-format |
382 | 382 |
msgid "When debugging it is recommended that you use Foreground mode in %s\n" |
383 | 383 |
msgstr "" |
384 | 384 |
|
385 |
-#: clamav-milter.c:1339 |
|
385 |
+#: clamav-milter.c:1351 |
|
386 | 386 |
msgid "\tso that you can see all of the messages" |
387 | 387 |
msgstr "" |
388 | 388 |
|
389 |
-#: clamav-milter.c:1430 |
|
389 |
+#: clamav-milter.c:1437 |
|
390 | 390 |
#, c-format |
391 | 391 |
msgid "%s: ScanMail not defined in %s (needed without --external), enabling\n" |
392 | 392 |
msgstr "" |
393 | 393 |
|
394 |
-#: clamav-milter.c:1492 |
|
394 |
+#: clamav-milter.c:1498 |
|
395 | 395 |
msgid "Starting clamav-milter" |
396 | 396 |
msgstr "" |
397 | 397 |
|
398 |
-#: clamav-milter.c:1502 |
|
398 |
+#: clamav-milter.c:1508 |
|
399 | 399 |
#, c-format |
400 | 400 |
msgid "pidfile: '%s' must be a full pathname" |
401 | 401 |
msgstr "" |
402 | 402 |
|
403 |
-#: clamav-milter.c:1504 |
|
403 |
+#: clamav-milter.c:1510 |
|
404 | 404 |
#, c-format |
405 | 405 |
msgid "pidfile '%s' must be a full pathname\n" |
406 | 406 |
msgstr "" |
407 | 407 |
|
408 |
-#: clamav-milter.c:1518 |
|
408 |
+#: clamav-milter.c:1524 |
|
409 | 409 |
#, c-format |
410 | 410 |
msgid "Can't save PID in file %s" |
411 | 411 |
msgstr "" |
412 | 412 |
|
413 |
-#: clamav-milter.c:1520 |
|
413 |
+#: clamav-milter.c:1526 |
|
414 | 414 |
#, c-format |
415 | 415 |
msgid "Can't save PID in file %s\n" |
416 | 416 |
msgstr "" |
417 | 417 |
|
418 |
-#: clamav-milter.c:1584 |
|
418 |
+#: clamav-milter.c:1588 |
|
419 | 419 |
#, c-format |
420 | 420 |
msgid "Starting %s" |
421 | 421 |
msgstr "" |
422 | 422 |
|
423 |
-#: clamav-milter.c:1587 |
|
423 |
+#: clamav-milter.c:1591 |
|
424 | 424 |
msgid "Debugging is on" |
425 | 425 |
msgstr "" |
426 | 426 |
|
427 |
-#: clamav-milter.c:1652 clamav-milter.c:1911 |
|
427 |
+#: clamav-milter.c:1656 clamav-milter.c:1915 |
|
428 | 428 |
#, c-format |
429 | 429 |
msgid "Check clamd server %s - it may be down\n" |
430 | 430 |
msgstr "" |
431 | 431 |
|
432 |
-#: clamav-milter.c:1657 |
|
432 |
+#: clamav-milter.c:1661 |
|
433 | 433 |
msgid "Check clamd server - it may be down" |
434 | 434 |
msgstr "" |
435 | 435 |
|
436 |
-#: clamav-milter.c:1832 |
|
436 |
+#: clamav-milter.c:1836 |
|
437 | 437 |
msgid "No free clamd sessions\n" |
438 | 438 |
msgstr "" |
439 | 439 |
|
440 |
-#: clamav-milter.c:1914 |
|
440 |
+#: clamav-milter.c:1918 |
|
441 | 441 |
#, c-format |
442 | 442 |
msgid "Check clamd server %s - it may be down" |
443 | 443 |
msgstr "" |
444 | 444 |
|
445 |
-#: clamav-milter.c:1920 |
|
445 |
+#: clamav-milter.c:1924 |
|
446 | 446 |
msgid "Check clamd server - it may be down\n" |
447 | 447 |
msgstr "" |
448 | 448 |
|
449 |
-#: clamav-milter.c:1956 |
|
449 |
+#: clamav-milter.c:1960 |
|
450 | 450 |
msgid "findServer: select failed" |
451 | 451 |
msgstr "" |
452 | 452 |
|
453 |
-#: clamav-milter.c:1965 |
|
453 |
+#: clamav-milter.c:1969 |
|
454 | 454 |
#, c-format |
455 | 455 |
msgid "findServer: using server %d\n" |
456 | 456 |
msgstr "" |
457 | 457 |
|
458 |
-#: clamav-milter.c:1970 |
|
458 |
+#: clamav-milter.c:1974 |
|
459 | 459 |
msgid "findServer: No response from any server\n" |
460 | 460 |
msgstr "" |
461 | 461 |
|
462 |
-#: clamav-milter.c:1972 |
|
462 |
+#: clamav-milter.c:1976 |
|
463 | 463 |
msgid "findServer: No response from any server" |
464 | 464 |
msgstr "" |
465 | 465 |
|
466 |
-#: clamav-milter.c:2017 |
|
466 |
+#: clamav-milter.c:1997 |
|
467 | 467 |
msgid "clamfi_connect: ctx is null" |
468 | 468 |
msgstr "" |
469 | 469 |
|
470 |
-#: clamav-milter.c:2022 |
|
470 |
+#: clamav-milter.c:2002 |
|
471 | 471 |
msgid "clamfi_connect: hostname is null" |
472 | 472 |
msgstr "" |
473 | 473 |
|
474 |
-#: clamav-milter.c:2043 |
|
474 |
+#: clamav-milter.c:2023 |
|
475 | 475 |
msgid "clamfi_connect: remoteIP is null" |
476 | 476 |
msgstr "" |
477 | 477 |
|
478 |
-#: clamav-milter.c:2052 |
|
478 |
+#: clamav-milter.c:2032 |
|
479 | 479 |
#, c-format |
480 | 480 |
msgid "clamfi_connect: connection from %s" |
481 | 481 |
msgstr "" |
482 | 482 |
|
483 |
-#: clamav-milter.c:2053 |
|
483 |
+#: clamav-milter.c:2033 |
|
484 | 484 |
#, c-format |
485 | 485 |
msgid "clamfi_connect: connection from %s\n" |
486 | 486 |
msgstr "" |
487 | 487 |
|
488 |
-#: clamav-milter.c:2056 |
|
488 |
+#: clamav-milter.c:2036 |
|
489 | 489 |
#, c-format |
490 | 490 |
msgid "clamfi_connect: connection from %s [%s]" |
491 | 491 |
msgstr "" |
492 | 492 |
|
493 |
-#: clamav-milter.c:2057 |
|
493 |
+#: clamav-milter.c:2037 |
|
494 | 494 |
#, c-format |
495 | 495 |
msgid "clamfi_connect: connection from %s [%s]\n" |
496 | 496 |
msgstr "" |
497 | 497 |
|
498 |
-#: clamav-milter.c:2077 |
|
498 |
+#: clamav-milter.c:2057 |
|
499 | 499 |
msgid "Can't get sendmail hostname" |
500 | 500 |
msgstr "" |
501 | 501 |
|
502 |
-#: clamav-milter.c:2086 |
|
502 |
+#: clamav-milter.c:2066 |
|
503 | 503 |
#, c-format |
504 | 504 |
msgid "Access Denied: Host Unknown (%s)" |
505 | 505 |
msgstr "" |
506 | 506 |
|
507 |
-#: clamav-milter.c:2095 |
|
507 |
+#: clamav-milter.c:2075 |
|
508 | 508 |
#, c-format |
509 | 509 |
msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n" |
510 | 510 |
msgstr "" |
511 | 511 |
|
512 |
-#: clamav-milter.c:2106 |
|
512 |
+#: clamav-milter.c:2086 |
|
513 | 513 |
#, c-format |
514 | 514 |
msgid "Access Denied: Can't get IP address for (%s)" |
515 | 515 |
msgstr "" |
516 | 516 |
|
517 |
-#: clamav-milter.c:2123 |
|
517 |
+#: clamav-milter.c:2103 |
|
518 | 518 |
#, c-format |
519 | 519 |
msgid "Access Denied for %s[%s]" |
520 | 520 |
msgstr "" |
521 | 521 |
|
522 |
-#: clamav-milter.c:2141 |
|
522 |
+#: clamav-milter.c:2121 |
|
523 | 523 |
msgid "clamfi_connect: not scanning outgoing messages" |
524 | 524 |
msgstr "" |
525 | 525 |
|
526 |
-#: clamav-milter.c:2142 |
|
526 |
+#: clamav-milter.c:2122 |
|
527 | 527 |
msgid "clamfi_connect: not scanning outgoing messages\n" |
528 | 528 |
msgstr "" |
529 | 529 |
|
530 |
-#: clamav-milter.c:2150 |
|
530 |
+#: clamav-milter.c:2130 |
|
531 | 531 |
msgid "clamfi_connect: not scanning local messages" |
532 | 532 |
msgstr "" |
533 | 533 |
|
534 |
-#: clamav-milter.c:2151 |
|
534 |
+#: clamav-milter.c:2131 |
|
535 | 535 |
msgid "clamfi_connect: not scanning local messages\n" |
536 | 536 |
msgstr "" |
537 | 537 |
|
538 |
-#: clamav-milter.c:2165 |
|
538 |
+#: clamav-milter.c:2145 |
|
539 | 539 |
msgid "clamfi_connect: gethostname failed" |
540 | 540 |
msgstr "" |
541 | 541 |
|
542 |
-#: clamav-milter.c:2170 |
|
542 |
+#: clamav-milter.c:2150 |
|
543 | 543 |
msgid "Rejected email falsely claiming to be from here" |
544 | 544 |
msgstr "" |
545 | 545 |
|
546 |
-#: clamav-milter.c:2171 |
|
546 |
+#: clamav-milter.c:2151 |
|
547 | 547 |
msgid "You have claimed to be me, but you are not" |
548 | 548 |
msgstr "" |
549 | 549 |
|
550 |
-#: clamav-milter.c:2172 clamav-milter.c:2456 |
|
550 |
+#: clamav-milter.c:2152 clamav-milter.c:2436 |
|
551 | 551 |
msgid "Forged local address detected" |
552 | 552 |
msgstr "" |
553 | 553 |
|
554 |
-#: clamav-milter.c:2200 |
|
554 |
+#: clamav-milter.c:2180 |
|
555 | 555 |
msgid "Rejected email with empty from field" |
556 | 556 |
msgstr "" |
557 | 557 |
|
558 |
-#: clamav-milter.c:2201 |
|
558 |
+#: clamav-milter.c:2181 |
|
559 | 559 |
msgid "You have not said who the email is from" |
560 | 560 |
msgstr "" |
561 | 561 |
|
562 |
-#: clamav-milter.c:2202 |
|
562 |
+#: clamav-milter.c:2182 |
|
563 | 563 |
msgid "Reject email with empty from field" |
564 | 564 |
msgstr "" |
565 | 565 |
|
566 |
-#: clamav-milter.c:2224 |
|
566 |
+#: clamav-milter.c:2204 |
|
567 | 567 |
#, c-format |
568 | 568 |
msgid "hit max-children limit (%u >= %u)\n" |
569 | 569 |
msgstr "" |
570 | 570 |
|
571 |
-#: clamav-milter.c:2225 |
|
571 |
+#: clamav-milter.c:2205 |
|
572 | 572 |
#, c-format |
573 | 573 |
msgid "hit max-children limit (%u >= %u): waiting for some to exit\n" |
574 | 574 |
msgstr "" |
575 | 575 |
|
576 |
-#: clamav-milter.c:2231 |
|
576 |
+#: clamav-milter.c:2211 |
|
577 | 577 |
#, c-format |
578 | 578 |
msgid "hit max-children limit (%u >= %u)" |
579 | 579 |
msgstr "" |
580 | 580 |
|
581 |
-#: clamav-milter.c:2232 |
|
581 |
+#: clamav-milter.c:2212 |
|
582 | 582 |
#, c-format |
583 | 583 |
msgid "hit max-children limit (%u >= %u): waiting for some to exit" |
584 | 584 |
msgstr "" |
585 | 585 |
|
586 |
-#: clamav-milter.c:2237 |
|
586 |
+#: clamav-milter.c:2217 |
|
587 | 587 |
msgid "AV system temporarily overloaded - please try later" |
588 | 588 |
msgstr "" |
589 | 589 |
|
590 |
-#: clamav-milter.c:2270 |
|
590 |
+#: clamav-milter.c:2250 |
|
591 | 591 |
#, c-format |
592 | 592 |
msgid ">n_children = %d\n" |
593 | 593 |
msgstr "" |
594 | 594 |
|
595 |
-#: clamav-milter.c:2276 |
|
595 |
+#: clamav-milter.c:2256 |
|
596 | 596 |
msgid "Timeout waiting for a child to die" |
597 | 597 |
msgstr "" |
598 | 598 |
|
599 |
-#: clamav-milter.c:2278 |
|
599 |
+#: clamav-milter.c:2258 |
|
600 | 600 |
msgid "Timeout waiting for a child to die\n" |
601 | 601 |
msgstr "" |
602 | 602 |
|
603 |
-#: clamav-milter.c:2421 |
|
603 |
+#: clamav-milter.c:2401 |
|
604 | 604 |
msgid "clamfi_eoh" |
605 | 605 |
msgstr "" |
606 | 606 |
|
607 |
-#: clamav-milter.c:2424 |
|
607 |
+#: clamav-milter.c:2404 |
|
608 | 608 |
msgid "clamfi_eoh\n" |
609 | 609 |
msgstr "" |
610 | 610 |
|
611 |
-#: clamav-milter.c:2448 |
|
611 |
+#: clamav-milter.c:2428 |
|
612 | 612 |
msgid "clamfi_eoh: gethostname failed" |
613 | 613 |
msgstr "" |
614 | 614 |
|
615 |
-#: clamav-milter.c:2454 |
|
615 |
+#: clamav-milter.c:2434 |
|
616 | 616 |
#, c-format |
617 | 617 |
msgid "Rejected email falsely claiming to be from %s" |
618 | 618 |
msgstr "" |
619 | 619 |
|
620 |
-#: clamav-milter.c:2455 |
|
620 |
+#: clamav-milter.c:2435 |
|
621 | 621 |
msgid "You have claimed to be from me, but you are not" |
622 | 622 |
msgstr "" |
623 | 623 |
|
624 |
-#: clamav-milter.c:2492 |
|
624 |
+#: clamav-milter.c:2472 |
|
625 | 625 |
msgid "clamfi_eoh: ignoring whitelisted message" |
626 | 626 |
msgstr "" |
627 | 627 |
|
628 |
-#: clamav-milter.c:2494 |
|
628 |
+#: clamav-milter.c:2474 |
|
629 | 629 |
msgid "clamfi_eoh: ignoring whitelisted message\n" |
630 | 630 |
msgstr "" |
631 | 631 |
|
632 |
-#: clamav-milter.c:2508 |
|
632 |
+#: clamav-milter.c:2488 |
|
633 | 633 |
#, c-format |
634 | 634 |
msgid "clamfi_envbody: %u bytes" |
635 | 635 |
msgstr "" |
636 | 636 |
|
637 |
-#: clamav-milter.c:2510 |
|
637 |
+#: clamav-milter.c:2490 |
|
638 | 638 |
#, c-format |
639 | 639 |
msgid "clamfi_envbody: %u bytes\n" |
640 | 640 |
msgstr "" |
641 | 641 |
|
642 |
-#: clamav-milter.c:2523 clamav-milter.c:2817 |
|
642 |
+#: clamav-milter.c:2503 clamav-milter.c:2807 |
|
643 | 643 |
#, c-format |
644 | 644 |
msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned" |
645 | 645 |
msgstr "" |
646 | 646 |
|
647 |
-#: clamav-milter.c:2527 clamav-milter.c:2820 |
|
647 |
+#: clamav-milter.c:2507 clamav-milter.c:2810 |
|
648 | 648 |
msgid "Not Scanned - StreamMaxLength exceeded" |
649 | 649 |
msgstr "" |
650 | 650 |
|
651 |
-#: clamav-milter.c:2580 |
|
651 |
+#: clamav-milter.c:2560 |
|
652 | 652 |
#, c-format |
653 | 653 |
msgid "Failed to delete X-Virus-Status header %d" |
654 | 654 |
msgstr "" |
655 | 655 |
|
656 |
-#: clamav-milter.c:2643 |
|
656 |
+#: clamav-milter.c:2633 |
|
657 | 657 |
#, c-format |
658 | 658 |
msgid "failed to send SCAN %s command to clamd" |
659 | 659 |
msgstr "" |
660 | 660 |
|
661 |
-#: clamav-milter.c:2665 |
|
661 |
+#: clamav-milter.c:2655 |
|
662 | 662 |
msgid "failed to send SCAN command to clamd" |
663 | 663 |
msgstr "" |
664 | 664 |
|
665 |
-#: clamav-milter.c:2682 |
|
665 |
+#: clamav-milter.c:2672 |
|
666 | 666 |
#, c-format |
667 | 667 |
msgid "Waiting to read status from fd %d\n" |
668 | 668 |
msgstr "" |
669 | 669 |
|
670 |
-#: clamav-milter.c:2695 |
|
670 |
+#: clamav-milter.c:2685 |
|
671 | 671 |
#, c-format |
672 | 672 |
msgid "clamfi_eom: read %s" |
673 | 673 |
msgstr "" |
674 | 674 |
|
675 |
-#: clamav-milter.c:2696 |
|
675 |
+#: clamav-milter.c:2686 |
|
676 | 676 |
#, c-format |
677 | 677 |
msgid "clamfi_eom: read %s\n" |
678 | 678 |
msgstr "" |
679 | 679 |
|
680 |
-#: clamav-milter.c:2713 |
|
680 |
+#: clamav-milter.c:2703 |
|
681 | 681 |
#, c-format |
682 | 682 |
msgid "clamfi_eom: read nothing from clamd on %s" |
683 | 683 |
msgstr "" |
684 | 684 |
|
685 |
-#: clamav-milter.c:2715 |
|
685 |
+#: clamav-milter.c:2705 |
|
686 | 686 |
#, c-format |
687 | 687 |
msgid "clamfi_eom: read nothing from clamd on %s\n" |
688 | 688 |
msgstr "" |
689 | 689 |
|
690 |
-#: clamav-milter.c:2760 clamav-milter.c:2806 |
|
690 |
+#: clamav-milter.c:2750 clamav-milter.c:2796 |
|
691 | 691 |
msgid "Error determining host" |
692 | 692 |
msgstr "" |
693 | 693 |
|
694 |
-#: clamav-milter.c:2825 |
|
694 |
+#: clamav-milter.c:2815 |
|
695 | 695 |
msgid "Not Scanned" |
696 | 696 |
msgstr "" |
697 | 697 |
|
698 |
-#: clamav-milter.c:2854 |
|
698 |
+#: clamav-milter.c:2844 |
|
699 | 699 |
msgid "Infected with" |
700 | 700 |
msgstr "" |
701 | 701 |
|
702 |
-#: clamav-milter.c:2875 |
|
702 |
+#: clamav-milter.c:2865 |
|
703 | 703 |
#, c-format |
704 | 704 |
msgid "Intercepted virus from %s to" |
705 | 705 |
msgstr "" |
706 | 706 |
|
707 |
-#: clamav-milter.c:2968 |
|
707 |
+#: clamav-milter.c:2958 |
|
708 | 708 |
msgid "" |
709 | 709 |
"Subject: Virus intercepted\n" |
710 | 710 |
"\n" |
711 | 711 |
msgstr "" |
712 | 712 |
|
713 |
-#: clamav-milter.c:2976 |
|
713 |
+#: clamav-milter.c:2966 |
|
714 | 714 |
msgid "A message you sent to\n" |
715 | 715 |
msgstr "" |
716 | 716 |
|
717 |
-#: clamav-milter.c:2983 |
|
717 |
+#: clamav-milter.c:2973 |
|
718 | 718 |
#, c-format |
719 | 719 |
msgid "The message %1$s sent from %2$s to\n" |
720 | 720 |
msgstr "" |
721 | 721 |
|
722 |
-#: clamav-milter.c:2986 |
|
722 |
+#: clamav-milter.c:2976 |
|
723 | 723 |
#, c-format |
724 | 724 |
msgid "A message sent from %s to\n" |
725 | 725 |
msgstr "" |
726 | 726 |
|
727 |
-#: clamav-milter.c:2991 |
|
727 |
+#: clamav-milter.c:2981 |
|
728 | 728 |
#, c-format |
729 | 729 |
msgid "contained %s and has not been delivered.\n" |
730 | 730 |
msgstr "" |
731 | 731 |
|
732 |
-#: clamav-milter.c:2994 |
|
732 |
+#: clamav-milter.c:2984 |
|
733 | 733 |
#, c-format |
734 | 734 |
msgid "" |
735 | 735 |
"\n" |
736 | 736 |
"The message in question has been quarantined as %s\n" |
737 | 737 |
msgstr "" |
738 | 738 |
|
739 |
-#: clamav-milter.c:2997 |
|
739 |
+#: clamav-milter.c:2987 |
|
740 | 740 |
#, c-format |
741 | 741 |
msgid "" |
742 | 742 |
"\n" |
... | ... |
@@ -744,13 +744,13 @@ msgid "" |
744 | 744 |
"\n" |
745 | 745 |
msgstr "" |
746 | 746 |
|
747 |
-#: clamav-milter.c:3000 |
|
747 |
+#: clamav-milter.c:2990 |
|
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:3013 |
|
753 |
+#: clamav-milter.c:3003 |
|
754 | 754 |
#, c-format |
755 | 755 |
msgid "" |
756 | 756 |
"\n" |
... | ... |
@@ -758,240 +758,239 @@ msgid "" |
758 | 758 |
"%s\t\n" |
759 | 759 |
msgstr "" |
760 | 760 |
|
761 |
-#: clamav-milter.c:3023 |
|
761 |
+#: clamav-milter.c:3013 |
|
762 | 762 |
#, c-format |
763 | 763 |
msgid "Can't execute '%s' to send virus notice" |
764 | 764 |
msgstr "" |
765 | 765 |
|
766 |
-#: clamav-milter.c:3028 |
|
766 |
+#: clamav-milter.c:3018 |
|
767 | 767 |
#, c-format |
768 | 768 |
msgid "Quarantined infected mail as %s" |
769 | 769 |
msgstr "" |
770 | 770 |
|
771 |
-#: clamav-milter.c:3052 |
|
771 |
+#: clamav-milter.c:3042 |
|
772 | 772 |
#, c-format |
773 | 773 |
msgid "Can't set quarantine user %s" |
774 | 774 |
msgstr "" |
775 | 775 |
|
776 |
-#: clamav-milter.c:3054 |
|
776 |
+#: clamav-milter.c:3044 |
|
777 | 777 |
#, c-format |
778 | 778 |
msgid "Can't set quarantine user %s\n" |
779 | 779 |
msgstr "" |
780 | 780 |
|
781 |
-#: clamav-milter.c:3076 |
|
781 |
+#: clamav-milter.c:3066 |
|
782 | 782 |
#, c-format |
783 | 783 |
msgid "virus %s detected by ClamAV - http://www.clamav.net" |
784 | 784 |
msgstr "" |
785 | 785 |
|
786 |
-#: clamav-milter.c:3081 |
|
786 |
+#: clamav-milter.c:3071 |
|
787 | 787 |
msgid "Unknown" |
788 | 788 |
msgstr "" |
789 | 789 |
|
790 |
-#: clamav-milter.c:3083 |
|
790 |
+#: clamav-milter.c:3073 |
|
791 | 791 |
#, c-format |
792 | 792 |
msgid "%s: incorrect message \"%s\" from clamd" |
793 | 793 |
msgstr "" |
794 | 794 |
|
795 |
-#: clamav-milter.c:3089 |
|
795 |
+#: clamav-milter.c:3079 |
|
796 | 796 |
msgid "Clean" |
797 | 797 |
msgstr "" |
798 | 798 |
|
799 |
-#: clamav-milter.c:3093 |
|
799 |
+#: clamav-milter.c:3083 |
|
800 | 800 |
#, c-format |
801 | 801 |
msgid "%s: clean message from %s" |
802 | 802 |
msgstr "" |
803 | 803 |
|
804 |
-#: clamav-milter.c:3095 |
|
804 |
+#: clamav-milter.c:3085 |
|
805 | 805 |
msgid "an unknown sender" |
806 | 806 |
msgstr "" |
807 | 807 |
|
808 |
-#: clamav-milter.c:3199 |
|
808 |
+#: clamav-milter.c:3189 |
|
809 | 809 |
#, c-format |
810 | 810 |
msgid "Can't remove clean file %s" |
811 | 811 |
msgstr "" |
812 | 812 |
|
813 |
-#: clamav-milter.c:3382 clamav-milter.c:3385 |
|
813 |
+#: clamav-milter.c:3372 clamav-milter.c:3375 |
|
814 | 814 |
#, c-format |
815 | 815 |
msgid "write failure (%u bytes) to %s: %s" |
816 | 816 |
msgstr "" |
817 | 817 |
|
818 |
-#: clamav-milter.c:3399 clamav-milter.c:3402 |
|
818 |
+#: clamav-milter.c:3389 clamav-milter.c:3392 |
|
819 | 819 |
#, c-format |
820 | 820 |
msgid "write failure (%u bytes) to clamd: %s" |
821 | 821 |
msgstr "" |
822 | 822 |
|
823 |
-#: clamav-milter.c:3468 |
|
823 |
+#: clamav-milter.c:3458 |
|
824 | 824 |
#, c-format |
825 | 825 |
msgid "No data received from clamd in %d seconds\n" |
826 | 826 |
msgstr "" |
827 | 827 |
|
828 |
-#: clamav-milter.c:3490 |
|
828 |
+#: clamav-milter.c:3480 |
|
829 | 829 |
#, c-format |
830 | 830 |
msgid "Can't stat %s" |
831 | 831 |
msgstr "" |
832 | 832 |
|
833 |
-#: clamav-milter.c:3501 clamav-milter.c:3942 |
|
833 |
+#: clamav-milter.c:3491 clamav-milter.c:3932 |
|
834 | 834 |
#, c-format |
835 | 835 |
msgid "Can't open %s" |
836 | 836 |
msgstr "" |
837 | 837 |
|
838 |
-#: clamav-milter.c:3626 clamav-milter.c:4111 |
|
838 |
+#: clamav-milter.c:3616 clamav-milter.c:4101 |
|
839 | 839 |
#, c-format |
840 | 840 |
msgid "mkdir %s failed" |
841 | 841 |
msgstr "" |
842 | 842 |
|
843 |
-#: clamav-milter.c:3638 |
|
843 |
+#: clamav-milter.c:3628 |
|
844 | 844 |
#, c-format |
845 | 845 |
msgid "mktemp %s failed" |
846 | 846 |
msgstr "" |
847 | 847 |
|
848 |
-#: clamav-milter.c:3648 |
|
848 |
+#: clamav-milter.c:3638 |
|
849 | 849 |
#, c-format |
850 | 850 |
msgid "Temporary quarantine file %s creation failed" |
851 | 851 |
msgstr "" |
852 | 852 |
|
853 |
-#: clamav-milter.c:3751 |
|
853 |
+#: clamav-milter.c:3741 |
|
854 | 854 |
#, c-format |
855 | 855 |
msgid "failed to send STREAM command clamd server %d" |
856 | 856 |
msgstr "" |
857 | 857 |
|
858 |
-#: clamav-milter.c:3760 |
|
858 |
+#: clamav-milter.c:3750 |
|
859 | 859 |
msgid "failed to send STREAM command clamd" |
860 | 860 |
msgstr "" |
861 | 861 |
|
862 |
-#: clamav-milter.c:3772 |
|
862 |
+#: clamav-milter.c:3762 |
|
863 | 863 |
msgid "failed to create TCPSocket to talk to clamd" |
864 | 864 |
msgstr "" |
865 | 865 |
|
866 |
-#: clamav-milter.c:3784 clamav-milter.c:3800 |
|
866 |
+#: clamav-milter.c:3774 clamav-milter.c:3790 |
|
867 | 867 |
msgid "recv failed from clamd getting PORT" |
868 | 868 |
msgstr "" |
869 | 869 |
|
870 |
-#: clamav-milter.c:3788 clamav-milter.c:3802 |
|
870 |
+#: clamav-milter.c:3778 clamav-milter.c:3792 |
|
871 | 871 |
msgid "EOF from clamd getting PORT" |
872 | 872 |
msgstr "" |
873 | 873 |
|
874 |
-#: clamav-milter.c:3813 |
|
874 |
+#: clamav-milter.c:3803 |
|
875 | 875 |
#, c-format |
876 | 876 |
msgid "Expected port information from clamd, got '%s'" |
877 | 877 |
msgstr "" |
878 | 878 |
|
879 |
-#: clamav-milter.c:3816 |
|
879 |
+#: clamav-milter.c:3806 |
|
880 | 880 |
#, c-format |
881 | 881 |
msgid "Expected port information from clamd, got '%s'\n" |
882 | 882 |
msgstr "" |
883 | 883 |
|
884 |
-#: clamav-milter.c:3836 clamav-milter.c:3839 |
|
884 |
+#: clamav-milter.c:3826 clamav-milter.c:3829 |
|
885 | 885 |
#, c-format |
886 | 886 |
msgid "Connecting to local port %d - data %d cmd %d\n" |
887 | 887 |
msgstr "" |
888 | 888 |
|
889 |
-#: clamav-milter.c:3854 clamav-milter.c:3857 |
|
889 |
+#: clamav-milter.c:3844 clamav-milter.c:3847 |
|
890 | 890 |
#, c-format |
891 | 891 |
msgid "Failed to connect to port %d given by clamd: %s" |
892 | 892 |
msgstr "" |
893 | 893 |
|
894 |
-#: clamav-milter.c:3954 |
|
894 |
+#: clamav-milter.c:3944 |
|
895 | 895 |
#, c-format |
896 | 896 |
msgid "Clamd (pid %d) seems to have died" |
897 | 897 |
msgstr "" |
898 | 898 |
|
899 |
-#: clamav-milter.c:3980 |
|
899 |
+#: clamav-milter.c:3970 |
|
900 | 900 |
#, c-format |
901 | 901 |
msgid "Can't open e-mail template file %s" |
902 | 902 |
msgstr "" |
903 | 903 |
|
904 |
-#: clamav-milter.c:3989 |
|
904 |
+#: clamav-milter.c:3979 |
|
905 | 905 |
#, c-format |
906 | 906 |
msgid "Can't stat e-mail template file %s" |
907 | 907 |
msgstr "" |
908 | 908 |
|
909 |
-#: clamav-milter.c:3998 |
|
909 |
+#: clamav-milter.c:3988 |
|
910 | 910 |
msgid "Out of memory" |
911 | 911 |
msgstr "" |
912 | 912 |
|
913 |
-#: clamav-milter.c:4025 |
|
913 |
+#: clamav-milter.c:4015 |
|
914 | 914 |
#, c-format |
915 | 915 |
msgid "%s: Unknown clamAV variable \"%c\"\n" |
916 | 916 |
msgstr "" |
917 | 917 |
|
918 |
-#: clamav-milter.c:4036 |
|
918 |
+#: clamav-milter.c:4026 |
|
919 | 919 |
#, c-format |
920 | 920 |
msgid "%s: Unterminated sendmail variable \"%s\"\n" |
921 | 921 |
msgstr "" |
922 | 922 |
|
923 |
-#: clamav-milter.c:4047 |
|
923 |
+#: clamav-milter.c:4037 |
|
924 | 924 |
#, c-format |
925 | 925 |
msgid "%s: Unknown sendmail variable \"%s\"\n" |
926 | 926 |
msgstr "" |
927 | 927 |
|
928 |
-#: clamav-milter.c:4137 |
|
928 |
+#: clamav-milter.c:4127 |
|
929 | 929 |
#, c-format |
930 | 930 |
msgid "Can't rename %1$s to %2$s" |
931 | 931 |
msgstr "" |
932 | 932 |
|
933 |
-#: clamav-milter.c:4146 |
|
933 |
+#: clamav-milter.c:4136 |
|
934 | 934 |
#, c-format |
935 | 935 |
msgid "File quarantined as %s" |
936 | 936 |
msgstr "" |
937 | 937 |
|
938 |
-#: clamav-milter.c:4238 |
|
938 |
+#: clamav-milter.c:4228 |
|
939 | 939 |
#, c-format |
940 | 940 |
msgid "[Virus] %s" |
941 | 941 |
msgstr "" |
942 | 942 |
|
943 |
-#: clamav-milter.c:4332 |
|
943 |
+#: clamav-milter.c:4322 |
|
944 | 944 |
msgid "" |
945 | 945 |
"No response from any clamd server - your AV system is not scanning emails\n" |
946 | 946 |
msgstr "" |
947 | 947 |
|
948 |
-#: clamav-milter.c:4335 |
|
948 |
+#: clamav-milter.c:4325 |
|
949 | 949 |
msgid "" |
950 | 950 |
"No response from any clamd server - your AV system is not scanning emails" |
951 | 951 |
msgstr "" |
952 | 952 |
|
953 |
-#: clamav-milter.c:4353 |
|
953 |
+#: clamav-milter.c:4343 |
|
954 | 954 |
msgid "Subject: ClamAV Down\n" |
955 | 955 |
msgstr "" |
956 | 956 |
|
957 |
-#: clamav-milter.c:4356 |
|
957 |
+#: clamav-milter.c:4346 |
|
958 | 958 |
msgid "" |
959 | 959 |
"This is an automatic message\n" |
960 | 960 |
"\n" |
961 | 961 |
msgstr "" |
962 | 962 |
|
963 |
-#: clamav-milter.c:4359 |
|
963 |
+#: clamav-milter.c:4349 |
|
964 | 964 |
msgid "The clamd program cannot be contacted.\n" |
965 | 965 |
msgstr "" |
966 | 966 |
|
967 |
-#: clamav-milter.c:4361 |
|
967 |
+#: clamav-milter.c:4351 |
|
968 | 968 |
msgid "No clamd server can be contacted.\n" |
969 | 969 |
msgstr "" |
970 | 970 |
|
971 |
-#: clamav-milter.c:4363 |
|
971 |
+#: clamav-milter.c:4353 |
|
972 | 972 |
msgid "Emails may not be being scanned, please check your servers.\n" |
973 | 973 |
msgstr "" |
974 | 974 |
|
975 |
-#: clamav-milter.c:4443 clamav-milter.c:4468 clamav-milter.c:4634 |
|
976 |
-#: clamav-milter.c:4658 |
|
975 |
+#: clamav-milter.c:4420 clamav-milter.c:4571 |
|
977 | 976 |
msgid "Loading new database" |
978 | 977 |
msgstr "" |
979 | 978 |
|
980 |
-#: clamav-milter.c:4779 |
|
979 |
+#: clamav-milter.c:4686 |
|
981 | 980 |
#, c-format |
982 | 981 |
msgid "Stopping %s" |
983 | 982 |
msgstr "" |
984 | 983 |
|
985 |
-#: clamav-milter.c:4825 |
|
984 |
+#: clamav-milter.c:4734 |
|
986 | 985 |
msgid "Stopping clamav-milter" |
987 | 986 |
msgstr "" |
988 | 987 |
|
989 |
-#: clamav-milter.c:4943 |
|
988 |
+#: clamav-milter.c:4861 |
|
990 | 989 |
#, c-format |
991 |
-msgid "ClamAV: Protecting against %u viruses" |
|
990 |
+msgid "Loaded %s" |
|
992 | 991 |
msgstr "" |
993 | 992 |
|
994 |
-#: clamav-milter.c:4948 |
|
993 |
+#: clamav-milter.c:4865 |
|
995 | 994 |
#, c-format |
996 |
-msgid "Loaded %s" |
|
995 |
+msgid "ClamAV: Protecting against %u viruses" |
|
997 | 996 |
msgstr "" |