git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1481 77e5149b-7576-45b1-b177-96237e5ba77b
Nigel Horne authored on 2005/04/18 19:56:48... | ... |
@@ -1,3 +1,9 @@ |
1 |
+Mon Apr 18 11:55:48 BST 2005 |
|
2 |
+---------------------------- |
|
3 |
+ * clamav-milter: Fixed a multi-threading problem relating to updating |
|
4 |
+ the database when in internal mode |
|
5 |
+ Use HAVE_CTIME_R_[23] |
|
6 |
+ |
|
1 | 7 |
Thu Apr 14 19:39:49 BST 2005 (trog) |
2 | 8 |
* libclamav/scanners.c, libclamav/vba_extract.[ch]: |
3 | 9 |
Decode and scan OLE objects embedded in MS Office documents. |
... | ... |
@@ -758,6 +758,9 @@ Changes |
758 | 758 |
Included patch by Andy Feldt <feldt@nhn.ou.edu> for |
759 | 759 |
AIX 5.2. I do not have access to such a machine |
760 | 760 |
so any feedback would be helpful |
761 |
+0.84e 18/4/05: Fixed a multi-threading problem relating to updating |
|
762 |
+ the database when in internal mode |
|
763 |
+ Use HAVE_CTIME_R_[23] |
|
761 | 764 |
|
762 | 765 |
4. INTERNATIONALISATION |
763 | 766 |
|
... | ... |
@@ -20,13 +20,11 @@ |
20 | 20 |
* |
21 | 21 |
* Install into /usr/local/sbin/clamav-milter |
22 | 22 |
* |
23 |
- * See http://www.nmt.edu/~wcolburn/sendmail-8.12.5/libmilter/docs/sample.html |
|
24 |
- * |
|
25 | 23 |
* For installation instructions see the file INSTALL that came with this file |
26 | 24 |
*/ |
27 |
-static char const rcsid[] = "$Id: clamav-milter.c,v 1.191 2005/04/07 16:37:16 nigelhorne Exp $"; |
|
25 |
+static char const rcsid[] = "$Id: clamav-milter.c,v 1.192 2005/04/18 10:53:34 nigelhorne Exp $"; |
|
28 | 26 |
|
29 |
-#define CM_VERSION "0.84d" |
|
27 |
+#define CM_VERSION "0.84e" |
|
30 | 28 |
|
31 | 29 |
#if HAVE_CONFIG_H |
32 | 30 |
#include "clamav-config.h" |
... | ... |
@@ -1362,7 +1360,7 @@ main(int argc, char **argv) |
1362 | 1362 |
#endif |
1363 | 1363 |
#else |
1364 | 1364 |
#ifdef HAVE_SETSID |
1365 |
- setsid(); |
|
1365 |
+ setsid(); |
|
1366 | 1366 |
#endif |
1367 | 1367 |
#endif |
1368 | 1368 |
} |
... | ... |
@@ -1482,8 +1480,7 @@ main(int argc, char **argv) |
1482 | 1482 |
} |
1483 | 1483 |
|
1484 | 1484 |
if(smfi_setconn(port) == MI_FAILURE) { |
1485 |
- fprintf(stderr, _("%s: smfi_setconn failed\n"), |
|
1486 |
- argv[0]); |
|
1485 |
+ cli_errmsg("smfi_setconn failure\n"); |
|
1487 | 1486 |
return EX_SOFTWARE; |
1488 | 1487 |
} |
1489 | 1488 |
|
... | ... |
@@ -1492,6 +1489,14 @@ main(int argc, char **argv) |
1492 | 1492 |
return EX_UNAVAILABLE; |
1493 | 1493 |
} |
1494 | 1494 |
|
1495 |
+#if 0 |
|
1496 |
+ /* Only supported by later libmilter */ |
|
1497 |
+ if(smfi_opensocket(1) == MI_FAILURE) { |
|
1498 |
+ cli_errmsg("can't open/create %s\n", port); |
|
1499 |
+ return EX_CONFIG; |
|
1500 |
+ } |
|
1501 |
+#endif |
|
1502 |
+ |
|
1495 | 1503 |
signal(SIGPIPE, SIG_IGN); |
1496 | 1504 |
|
1497 | 1505 |
#ifdef SESSION |
... | ... |
@@ -1707,10 +1712,10 @@ findServer(void) |
1707 | 1707 |
* FIXME: Sessions code isn't flexible at handling servers |
1708 | 1708 |
* appearing and disappearing, e.g. sessions[n_children].sock == -1 |
1709 | 1709 |
*/ |
1710 |
+ i = 0; |
|
1710 | 1711 |
pthread_mutex_lock(&n_children_mutex); |
1711 | 1712 |
assert(n_children > 0); |
1712 | 1713 |
assert(n_children <= max_children); |
1713 |
- i = 0; |
|
1714 | 1714 |
j = n_children - 1; |
1715 | 1715 |
pthread_mutex_unlock(&n_children_mutex); |
1716 | 1716 |
|
... | ... |
@@ -1915,12 +1920,10 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr) |
1915 | 1915 |
cli_warnmsg("Not accepting inputs at the moment\n"); |
1916 | 1916 |
if(dont_wait) |
1917 | 1917 |
return SMFIS_TEMPFAIL; |
1918 |
- do { |
|
1918 |
+ pthread_mutex_lock(&accept_mutex); |
|
1919 |
+ while(!accept_inputs) |
|
1919 | 1920 |
pthread_cond_wait(&accept_cond, &accept_mutex); |
1920 |
- pthread_mutex_lock(&accept_mutex); |
|
1921 |
- accepting = accept_inputs; |
|
1922 |
- pthread_mutex_unlock(&accept_mutex); |
|
1923 |
- } while(!accepting); |
|
1921 |
+ pthread_mutex_unlock(&accept_mutex); |
|
1924 | 1922 |
cli_warnmsg("Accepting inputs again\n"); |
1925 | 1923 |
} |
1926 | 1924 |
|
... | ... |
@@ -5026,18 +5029,20 @@ logger(const char *mess) |
5026 | 5026 |
return; |
5027 | 5027 |
|
5028 | 5028 |
if(logTime) { |
5029 |
+#ifdef HAVE_CTIME_R |
|
5029 | 5030 |
time_t currtime = time((time_t)0); |
5030 | 5031 |
char buf[27]; |
5031 | 5032 |
|
5032 |
- /* |
|
5033 |
- * FIXME: This should be HAS_CTIME_R2 and HAS_CTIME_R3 |
|
5034 |
- */ |
|
5035 |
-#ifdef C_SOLARIS |
|
5033 |
+#ifdef HAVE_CTIME_R_3 |
|
5036 | 5034 |
ctime_r(&currtime, buf, sizeof(buf)); |
5037 | 5035 |
#else |
5038 | 5036 |
ctime_r(&currtime, buf); |
5039 | 5037 |
#endif |
5040 | 5038 |
fprintf(fout, "%.*s -> %s\n", strlen(buf) - 1, buf, mess); |
5039 |
+#else /*!HAVE_CTIME_R*/ |
|
5040 |
+ /* TODO */ |
|
5041 |
+ fprintf(fout, "%s\n", mess); |
|
5042 |
+#endif |
|
5041 | 5043 |
} else |
5042 | 5044 |
fprintf(fout, "%s\n", mess); |
5043 | 5045 |
fclose(fout); |
... | ... |
@@ -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-03-18 08:40+0000\n" |
|
11 |
+"POT-Creation-Date: 2005-04-18 11:53+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,712 +16,707 @@ msgstr "" |
16 | 16 |
"Content-Type: text/plain; charset=CHARSET\n" |
17 | 17 |
"Content-Transfer-Encoding: 8bit\n" |
18 | 18 |
|
19 |
-#: clamav-milter.c:458 |
|
19 |
+#: clamav-milter.c:464 |
|
20 | 20 |
msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them." |
21 | 21 |
msgstr "" |
22 | 22 |
|
23 |
-#: clamav-milter.c:459 |
|
23 |
+#: clamav-milter.c:465 |
|
24 | 24 |
msgid "\t--bounce\t\t-b\tSend a failure message to the sender." |
25 | 25 |
msgstr "" |
26 | 26 |
|
27 |
-#: clamav-milter.c:460 |
|
27 |
+#: clamav-milter.c:466 |
|
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:461 |
|
33 |
+#: clamav-milter.c:467 |
|
34 | 34 |
msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE." |
35 | 35 |
msgstr "" |
36 | 36 |
|
37 |
-#: clamav-milter.c:462 |
|
37 |
+#: clamav-milter.c:468 |
|
38 | 38 |
msgid "\t--debug\t\t\t-D\tPrint debug messages." |
39 | 39 |
msgstr "" |
40 | 40 |
|
41 |
-#: clamav-milter.c:463 |
|
41 |
+#: clamav-milter.c:469 |
|
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:464 |
|
46 |
+#: clamav-milter.c:470 |
|
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:465 |
|
51 |
+#: clamav-milter.c:471 |
|
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:466 |
|
57 |
+#: clamav-milter.c:472 |
|
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:467 |
|
61 |
+#: clamav-milter.c:473 |
|
62 | 62 |
msgid "\t--external\t\t-e\tUse an external scanner (usually clamd)." |
63 | 63 |
msgstr "" |
64 | 64 |
|
65 |
-#: clamav-milter.c:468 |
|
65 |
+#: clamav-milter.c:474 |
|
66 | 66 |
msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here." |
67 | 67 |
msgstr "" |
68 | 68 |
|
69 |
-#: clamav-milter.c:469 |
|
69 |
+#: clamav-milter.c:475 |
|
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:470 |
|
73 |
+#: clamav-milter.c:476 |
|
74 | 74 |
msgid "\t--help\t\t\t-h\tThis message." |
75 | 75 |
msgstr "" |
76 | 76 |
|
77 |
-#: clamav-milter.c:471 |
|
77 |
+#: clamav-milter.c:477 |
|
78 | 78 |
msgid "\t--headers\t\t-H\tInclude original message headers in the report." |
79 | 79 |
msgstr "" |
80 | 80 |
|
81 |
-#: clamav-milter.c:472 |
|
81 |
+#: clamav-milter.c:478 |
|
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:473 |
|
85 |
+#: clamav-milter.c:479 |
|
86 | 86 |
msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans." |
87 | 87 |
msgstr "" |
88 | 88 |
|
89 |
-#: clamav-milter.c:474 |
|
89 |
+#: clamav-milter.c:480 |
|
90 | 90 |
msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine." |
91 | 91 |
msgstr "" |
92 | 92 |
|
93 |
-#: clamav-milter.c:475 |
|
93 |
+#: clamav-milter.c:481 |
|
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:476 |
|
97 |
+#: clamav-milter.c:482 |
|
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:477 |
|
101 |
+#: clamav-milter.c:483 |
|
102 | 102 |
msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile." |
103 | 103 |
msgstr "" |
104 | 104 |
|
105 |
-#: clamav-milter.c:478 |
|
105 |
+#: clamav-milter.c:484 |
|
106 | 106 |
msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]." |
107 | 107 |
msgstr "" |
108 | 108 |
|
109 |
-#: clamav-milter.c:479 |
|
109 |
+#: clamav-milter.c:485 |
|
110 | 110 |
msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster." |
111 | 111 |
msgstr "" |
112 | 112 |
|
113 |
-#: clamav-milter.c:480 |
|
113 |
+#: clamav-milter.c:486 |
|
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:481 |
|
117 |
+#: clamav-milter.c:487 |
|
118 | 118 |
msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account." |
119 | 119 |
msgstr "" |
120 | 120 |
|
121 |
-#: clamav-milter.c:482 |
|
121 |
+#: clamav-milter.c:488 |
|
122 | 122 |
msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails." |
123 | 123 |
msgstr "" |
124 | 124 |
|
125 |
-#: clamav-milter.c:483 |
|
125 |
+#: clamav-milter.c:489 |
|
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:484 |
|
131 |
+#: clamav-milter.c:490 |
|
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:485 |
|
135 |
+#: clamav-milter.c:491 |
|
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:486 |
|
139 |
+#: clamav-milter.c:492 |
|
140 | 140 |
msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file." |
141 | 141 |
msgstr "" |
142 | 142 |
|
143 |
-#: clamav-milter.c:487 |
|
143 |
+#: clamav-milter.c:493 |
|
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:488 |
|
147 |
+#: clamav-milter.c:494 |
|
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:489 |
|
151 |
+#: clamav-milter.c:495 |
|
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:490 |
|
157 |
+#: clamav-milter.c:496 |
|
158 | 158 |
msgid "\t--version\t\t-V\tPrint the version number of this software." |
159 | 159 |
msgstr "" |
160 | 160 |
|
161 |
-#: clamav-milter.c:492 |
|
161 |
+#: clamav-milter.c:498 |
|
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:494 |
|
165 |
+#: clamav-milter.c:500 |
|
166 | 166 |
msgid "" |
167 | 167 |
"\n" |
168 | 168 |
"For more information type \"man clamav-milter\"." |
169 | 169 |
msgstr "" |
170 | 170 |
|
171 |
-#: clamav-milter.c:495 |
|
171 |
+#: clamav-milter.c:501 |
|
172 | 172 |
msgid "Report bugs to bugs@clamav.net." |
173 | 173 |
msgstr "" |
174 | 174 |
|
175 |
-#: clamav-milter.c:809 |
|
175 |
+#: clamav-milter.c:815 |
|
176 | 176 |
#, c-format |
177 | 177 |
msgid "%s: No socket-addr given\n" |
178 | 178 |
msgstr "" |
179 | 179 |
|
180 |
-#: clamav-milter.c:815 |
|
180 |
+#: clamav-milter.c:821 |
|
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:830 |
|
185 |
+#: clamav-milter.c:836 |
|
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:838 |
|
190 |
+#: clamav-milter.c:844 |
|
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:845 |
|
195 |
+#: clamav-milter.c:851 |
|
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:849 |
|
200 |
+#: clamav-milter.c:855 |
|
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:853 |
|
205 |
+#: clamav-milter.c:859 |
|
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:892 |
|
210 |
+#: clamav-milter.c:898 |
|
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:901 |
|
217 |
+#: clamav-milter.c:907 |
|
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:912 |
|
222 |
+#: clamav-milter.c:918 |
|
223 | 223 |
#, c-format |
224 | 224 |
msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n" |
225 | 225 |
msgstr "" |
226 | 226 |
|
227 |
-#: clamav-milter.c:929 |
|
227 |
+#: clamav-milter.c:935 |
|
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:932 |
|
232 |
+#: clamav-milter.c:938 |
|
233 | 233 |
#, c-format |
234 | 234 |
msgid "%s: running as root is not recommended (check \"User\" in clamd.conf)\n" |
235 | 235 |
msgstr "" |
236 | 236 |
|
237 |
-#: clamav-milter.c:934 |
|
237 |
+#: clamav-milter.c:940 |
|
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:939 |
|
242 |
+#: clamav-milter.c:945 |
|
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:947 |
|
247 |
+#: clamav-milter.c:953 |
|
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:953 |
|
252 |
+#: clamav-milter.c:959 |
|
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:959 |
|
257 |
+#: clamav-milter.c:965 |
|
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:965 |
|
262 |
+#: clamav-milter.c:971 |
|
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:982 |
|
267 |
+#: clamav-milter.c:988 |
|
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:1008 |
|
272 |
+#: clamav-milter.c:1014 |
|
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:1016 |
|
277 |
+#: clamav-milter.c:1022 |
|
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:1039 |
|
282 |
+#: clamav-milter.c:1045 |
|
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:1049 |
|
288 |
+#: clamav-milter.c:1055 |
|
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:1053 |
|
293 |
+#: clamav-milter.c:1059 |
|
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:1066 |
|
298 |
+#: clamav-milter.c:1072 |
|
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:1076 |
|
303 |
+#: clamav-milter.c:1082 |
|
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:1078 |
|
308 |
+#: clamav-milter.c:1084 |
|
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:1088 clamav-milter.c:1111 |
|
313 |
+#: clamav-milter.c:1094 clamav-milter.c:1117 |
|
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:1090 clamav-milter.c:1113 |
|
318 |
+#: clamav-milter.c:1096 clamav-milter.c:1119 |
|
319 | 319 |
#, c-format |
320 | 320 |
msgid "Check your entry for LocalSocket in %s\n" |
321 | 321 |
msgstr "" |
322 | 322 |
|
323 |
-#: clamav-milter.c:1124 |
|
323 |
+#: clamav-milter.c:1130 |
|
324 | 324 |
msgid "Can't create a clamd session" |
325 | 325 |
msgstr "" |
326 | 326 |
|
327 |
-#: clamav-milter.c:1141 |
|
327 |
+#: clamav-milter.c:1147 |
|
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:1156 |
|
332 |
+#: clamav-milter.c:1162 |
|
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:1175 clamav-milter.c:1258 |
|
337 |
+#: clamav-milter.c:1181 clamav-milter.c:1266 |
|
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:1198 |
|
342 |
+#: clamav-milter.c:1204 |
|
343 | 343 |
#, c-format |
344 | 344 |
msgid "%s: Unknown host %s\n" |
345 | 345 |
msgstr "" |
346 | 346 |
|
347 |
-#: clamav-milter.c:1210 |
|
347 |
+#: clamav-milter.c:1216 |
|
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:1227 |
|
352 |
+#: clamav-milter.c:1233 |
|
353 | 353 |
msgid "Can't find any active clamd servers\n" |
354 | 354 |
msgstr "" |
355 | 355 |
|
356 |
-#: clamav-milter.c:1228 clamav-milter.c:1234 |
|
356 |
+#: clamav-milter.c:1234 clamav-milter.c:1240 |
|
357 | 357 |
#, c-format |
358 | 358 |
msgid "Check your entry for TCPSocket in %s\n" |
359 | 359 |
msgstr "" |
360 | 360 |
|
361 |
-#: clamav-milter.c:1233 |
|
361 |
+#: clamav-milter.c:1239 |
|
362 | 362 |
msgid "Can't find any clamd servers\n" |
363 | 363 |
msgstr "" |
364 | 364 |
|
365 |
-#: clamav-milter.c:1240 |
|
365 |
+#: clamav-milter.c:1246 |
|
366 | 366 |
#, c-format |
367 | 367 |
msgid "%s: You must select server type (local/TCP) in %s\n" |
368 | 368 |
msgstr "" |
369 | 369 |
|
370 |
-#: clamav-milter.c:1306 |
|
370 |
+#: clamav-milter.c:1314 |
|
371 | 371 |
#, c-format |
372 | 372 |
msgid "When debugging it is recommended that you use Foreground mode in %s\n" |
373 | 373 |
msgstr "" |
374 | 374 |
|
375 |
-#: clamav-milter.c:1307 |
|
375 |
+#: clamav-milter.c:1315 |
|
376 | 376 |
msgid "\tso that you can see all of the messages" |
377 | 377 |
msgstr "" |
378 | 378 |
|
379 |
-#: clamav-milter.c:1368 |
|
379 |
+#: clamav-milter.c:1376 |
|
380 | 380 |
#, c-format |
381 | 381 |
msgid "%s: ScanMail not defined in %s (needed without --external), enabling\n" |
382 | 382 |
msgstr "" |
383 | 383 |
|
384 |
-#: clamav-milter.c:1430 |
|
384 |
+#: clamav-milter.c:1438 |
|
385 | 385 |
msgid "Starting clamav-milter" |
386 | 386 |
msgstr "" |
387 | 387 |
|
388 |
-#: clamav-milter.c:1439 |
|
388 |
+#: clamav-milter.c:1447 |
|
389 | 389 |
#, c-format |
390 | 390 |
msgid "Can't save PID in file %s" |
391 | 391 |
msgstr "" |
392 | 392 |
|
393 |
-#: clamav-milter.c:1441 |
|
393 |
+#: clamav-milter.c:1449 |
|
394 | 394 |
#, c-format |
395 | 395 |
msgid "Can't save PID in file %s\n" |
396 | 396 |
msgstr "" |
397 | 397 |
|
398 |
-#: clamav-milter.c:1475 |
|
399 |
-#, c-format |
|
400 |
-msgid "%s: smfi_setconn failed\n" |
|
401 |
-msgstr "" |
|
402 |
- |
|
403 |
-#: clamav-milter.c:1491 |
|
398 |
+#: clamav-milter.c:1506 |
|
404 | 399 |
#, c-format |
405 | 400 |
msgid "Starting %s" |
406 | 401 |
msgstr "" |
407 | 402 |
|
408 |
-#: clamav-milter.c:1494 |
|
403 |
+#: clamav-milter.c:1509 |
|
409 | 404 |
msgid "Debugging is on" |
410 | 405 |
msgstr "" |
411 | 406 |
|
412 |
-#: clamav-milter.c:1561 clamav-milter.c:1820 |
|
407 |
+#: clamav-milter.c:1576 clamav-milter.c:1835 |
|
413 | 408 |
#, c-format |
414 | 409 |
msgid "Check clamd server %s - it may be down\n" |
415 | 410 |
msgstr "" |
416 | 411 |
|
417 |
-#: clamav-milter.c:1566 |
|
412 |
+#: clamav-milter.c:1581 |
|
418 | 413 |
msgid "Check clamd server - it may be down" |
419 | 414 |
msgstr "" |
420 | 415 |
|
421 |
-#: clamav-milter.c:1741 |
|
416 |
+#: clamav-milter.c:1756 |
|
422 | 417 |
msgid "No free clamd sessions\n" |
423 | 418 |
msgstr "" |
424 | 419 |
|
425 |
-#: clamav-milter.c:1823 |
|
420 |
+#: clamav-milter.c:1838 |
|
426 | 421 |
#, c-format |
427 | 422 |
msgid "Check clamd server %s - it may be down" |
428 | 423 |
msgstr "" |
429 | 424 |
|
430 |
-#: clamav-milter.c:1829 |
|
425 |
+#: clamav-milter.c:1844 |
|
431 | 426 |
msgid "Check clamd server - it may be down\n" |
432 | 427 |
msgstr "" |
433 | 428 |
|
434 |
-#: clamav-milter.c:1865 |
|
429 |
+#: clamav-milter.c:1880 |
|
435 | 430 |
msgid "findServer: select failed" |
436 | 431 |
msgstr "" |
437 | 432 |
|
438 |
-#: clamav-milter.c:1874 |
|
433 |
+#: clamav-milter.c:1889 |
|
439 | 434 |
#, c-format |
440 | 435 |
msgid "findServer: using server %d\n" |
441 | 436 |
msgstr "" |
442 | 437 |
|
443 |
-#: clamav-milter.c:1879 |
|
438 |
+#: clamav-milter.c:1894 |
|
444 | 439 |
msgid "findServer: No response from any server\n" |
445 | 440 |
msgstr "" |
446 | 441 |
|
447 |
-#: clamav-milter.c:1881 |
|
442 |
+#: clamav-milter.c:1896 |
|
448 | 443 |
msgid "findServer: No response from any server" |
449 | 444 |
msgstr "" |
450 | 445 |
|
451 |
-#: clamav-milter.c:1919 |
|
446 |
+#: clamav-milter.c:1932 |
|
452 | 447 |
msgid "clamfi_connect: ctx is null" |
453 | 448 |
msgstr "" |
454 | 449 |
|
455 |
-#: clamav-milter.c:1924 |
|
450 |
+#: clamav-milter.c:1937 |
|
456 | 451 |
msgid "clamfi_connect: hostname is null" |
457 | 452 |
msgstr "" |
458 | 453 |
|
459 |
-#: clamav-milter.c:1945 |
|
454 |
+#: clamav-milter.c:1958 |
|
460 | 455 |
msgid "clamfi_connect: remoteIP is null" |
461 | 456 |
msgstr "" |
462 | 457 |
|
463 |
-#: clamav-milter.c:1954 |
|
458 |
+#: clamav-milter.c:1967 |
|
464 | 459 |
#, c-format |
465 | 460 |
msgid "clamfi_connect: connection from %s" |
466 | 461 |
msgstr "" |
467 | 462 |
|
468 |
-#: clamav-milter.c:1955 |
|
463 |
+#: clamav-milter.c:1968 |
|
469 | 464 |
#, c-format |
470 | 465 |
msgid "clamfi_connect: connection from %s\n" |
471 | 466 |
msgstr "" |
472 | 467 |
|
473 |
-#: clamav-milter.c:1958 |
|
468 |
+#: clamav-milter.c:1971 |
|
474 | 469 |
#, c-format |
475 | 470 |
msgid "clamfi_connect: connection from %s [%s]" |
476 | 471 |
msgstr "" |
477 | 472 |
|
478 |
-#: clamav-milter.c:1959 |
|
473 |
+#: clamav-milter.c:1972 |
|
479 | 474 |
#, c-format |
480 | 475 |
msgid "clamfi_connect: connection from %s [%s]\n" |
481 | 476 |
msgstr "" |
482 | 477 |
|
483 |
-#: clamav-milter.c:1979 |
|
478 |
+#: clamav-milter.c:1992 |
|
484 | 479 |
msgid "Can't get sendmail hostname" |
485 | 480 |
msgstr "" |
486 | 481 |
|
487 |
-#: clamav-milter.c:1988 |
|
482 |
+#: clamav-milter.c:2001 |
|
488 | 483 |
#, c-format |
489 | 484 |
msgid "Access Denied: Host Unknown (%s)" |
490 | 485 |
msgstr "" |
491 | 486 |
|
492 |
-#: clamav-milter.c:1997 |
|
487 |
+#: clamav-milter.c:2010 |
|
493 | 488 |
#, c-format |
494 | 489 |
msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n" |
495 | 490 |
msgstr "" |
496 | 491 |
|
497 |
-#: clamav-milter.c:2008 |
|
492 |
+#: clamav-milter.c:2021 |
|
498 | 493 |
#, c-format |
499 | 494 |
msgid "Access Denied: Can't get IP address for (%s)" |
500 | 495 |
msgstr "" |
501 | 496 |
|
502 |
-#: clamav-milter.c:2025 |
|
497 |
+#: clamav-milter.c:2038 |
|
503 | 498 |
#, c-format |
504 | 499 |
msgid "Access Denied for %s[%s]" |
505 | 500 |
msgstr "" |
506 | 501 |
|
507 |
-#: clamav-milter.c:2043 |
|
502 |
+#: clamav-milter.c:2056 |
|
508 | 503 |
msgid "clamfi_connect: not scanning outgoing messages" |
509 | 504 |
msgstr "" |
510 | 505 |
|
511 |
-#: clamav-milter.c:2044 |
|
506 |
+#: clamav-milter.c:2057 |
|
512 | 507 |
msgid "clamfi_connect: not scanning outgoing messages\n" |
513 | 508 |
msgstr "" |
514 | 509 |
|
515 |
-#: clamav-milter.c:2052 |
|
510 |
+#: clamav-milter.c:2065 |
|
516 | 511 |
msgid "clamfi_connect: not scanning local messages" |
517 | 512 |
msgstr "" |
518 | 513 |
|
519 |
-#: clamav-milter.c:2053 |
|
514 |
+#: clamav-milter.c:2066 |
|
520 | 515 |
msgid "clamfi_connect: not scanning local messages\n" |
521 | 516 |
msgstr "" |
522 | 517 |
|
523 |
-#: clamav-milter.c:2067 |
|
518 |
+#: clamav-milter.c:2080 |
|
524 | 519 |
msgid "clamfi_connect: gethostname failed" |
525 | 520 |
msgstr "" |
526 | 521 |
|
527 |
-#: clamav-milter.c:2072 |
|
522 |
+#: clamav-milter.c:2085 |
|
528 | 523 |
msgid "Rejected email falsely claiming to be from here" |
529 | 524 |
msgstr "" |
530 | 525 |
|
531 |
-#: clamav-milter.c:2073 |
|
526 |
+#: clamav-milter.c:2086 |
|
532 | 527 |
msgid "You have claimed to be me, but you are not" |
533 | 528 |
msgstr "" |
534 | 529 |
|
535 |
-#: clamav-milter.c:2074 clamav-milter.c:2358 |
|
530 |
+#: clamav-milter.c:2087 clamav-milter.c:2371 |
|
536 | 531 |
msgid "Forged local address detected" |
537 | 532 |
msgstr "" |
538 | 533 |
|
539 |
-#: clamav-milter.c:2102 |
|
534 |
+#: clamav-milter.c:2115 |
|
540 | 535 |
msgid "Rejected email with empty from field" |
541 | 536 |
msgstr "" |
542 | 537 |
|
543 |
-#: clamav-milter.c:2103 |
|
538 |
+#: clamav-milter.c:2116 |
|
544 | 539 |
msgid "You have not said who the email is from" |
545 | 540 |
msgstr "" |
546 | 541 |
|
547 |
-#: clamav-milter.c:2104 |
|
542 |
+#: clamav-milter.c:2117 |
|
548 | 543 |
msgid "Reject email with empty from field" |
549 | 544 |
msgstr "" |
550 | 545 |
|
551 |
-#: clamav-milter.c:2126 |
|
546 |
+#: clamav-milter.c:2139 |
|
552 | 547 |
#, c-format |
553 | 548 |
msgid "hit max-children limit (%u >= %u)\n" |
554 | 549 |
msgstr "" |
555 | 550 |
|
556 |
-#: clamav-milter.c:2127 |
|
551 |
+#: clamav-milter.c:2140 |
|
557 | 552 |
#, c-format |
558 | 553 |
msgid "hit max-children limit (%u >= %u): waiting for some to exit\n" |
559 | 554 |
msgstr "" |
560 | 555 |
|
561 |
-#: clamav-milter.c:2133 |
|
556 |
+#: clamav-milter.c:2146 |
|
562 | 557 |
#, c-format |
563 | 558 |
msgid "hit max-children limit (%u >= %u)" |
564 | 559 |
msgstr "" |
565 | 560 |
|
566 |
-#: clamav-milter.c:2134 |
|
561 |
+#: clamav-milter.c:2147 |
|
567 | 562 |
#, c-format |
568 | 563 |
msgid "hit max-children limit (%u >= %u): waiting for some to exit" |
569 | 564 |
msgstr "" |
570 | 565 |
|
571 |
-#: clamav-milter.c:2139 |
|
566 |
+#: clamav-milter.c:2152 |
|
572 | 567 |
msgid "AV system temporarily overloaded - please try later" |
573 | 568 |
msgstr "" |
574 | 569 |
|
575 |
-#: clamav-milter.c:2172 |
|
570 |
+#: clamav-milter.c:2185 |
|
576 | 571 |
#, c-format |
577 | 572 |
msgid ">n_children = %d\n" |
578 | 573 |
msgstr "" |
579 | 574 |
|
580 |
-#: clamav-milter.c:2178 |
|
575 |
+#: clamav-milter.c:2191 |
|
581 | 576 |
msgid "Timeout waiting for a child to die" |
582 | 577 |
msgstr "" |
583 | 578 |
|
584 |
-#: clamav-milter.c:2180 |
|
579 |
+#: clamav-milter.c:2193 |
|
585 | 580 |
msgid "Timeout waiting for a child to die\n" |
586 | 581 |
msgstr "" |
587 | 582 |
|
588 |
-#: clamav-milter.c:2323 |
|
583 |
+#: clamav-milter.c:2336 |
|
589 | 584 |
msgid "clamfi_eoh" |
590 | 585 |
msgstr "" |
591 | 586 |
|
592 |
-#: clamav-milter.c:2326 |
|
587 |
+#: clamav-milter.c:2339 |
|
593 | 588 |
msgid "clamfi_eoh\n" |
594 | 589 |
msgstr "" |
595 | 590 |
|
596 |
-#: clamav-milter.c:2350 |
|
591 |
+#: clamav-milter.c:2363 |
|
597 | 592 |
msgid "clamfi_eoh: gethostname failed" |
598 | 593 |
msgstr "" |
599 | 594 |
|
600 |
-#: clamav-milter.c:2356 |
|
595 |
+#: clamav-milter.c:2369 |
|
601 | 596 |
#, c-format |
602 | 597 |
msgid "Rejected email falsely claiming to be from %s" |
603 | 598 |
msgstr "" |
604 | 599 |
|
605 |
-#: clamav-milter.c:2357 |
|
600 |
+#: clamav-milter.c:2370 |
|
606 | 601 |
msgid "You have claimed to be from me, but you are not" |
607 | 602 |
msgstr "" |
608 | 603 |
|
609 |
-#: clamav-milter.c:2395 |
|
604 |
+#: clamav-milter.c:2407 |
|
610 | 605 |
msgid "clamfi_eoh: ignoring whitelisted message" |
611 | 606 |
msgstr "" |
612 | 607 |
|
613 |
-#: clamav-milter.c:2397 |
|
608 |
+#: clamav-milter.c:2409 |
|
614 | 609 |
msgid "clamfi_eoh: ignoring whitelisted message\n" |
615 | 610 |
msgstr "" |
616 | 611 |
|
617 |
-#: clamav-milter.c:2411 |
|
612 |
+#: clamav-milter.c:2423 |
|
618 | 613 |
#, c-format |
619 | 614 |
msgid "clamfi_envbody: %u bytes" |
620 | 615 |
msgstr "" |
621 | 616 |
|
622 |
-#: clamav-milter.c:2413 |
|
617 |
+#: clamav-milter.c:2425 |
|
623 | 618 |
#, c-format |
624 | 619 |
msgid "clamfi_envbody: %u bytes\n" |
625 | 620 |
msgstr "" |
626 | 621 |
|
627 |
-#: clamav-milter.c:2423 clamav-milter.c:2715 |
|
622 |
+#: clamav-milter.c:2435 clamav-milter.c:2729 |
|
628 | 623 |
#, c-format |
629 | 624 |
msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned" |
630 | 625 |
msgstr "" |
631 | 626 |
|
632 |
-#: clamav-milter.c:2427 clamav-milter.c:2718 |
|
627 |
+#: clamav-milter.c:2439 clamav-milter.c:2732 |
|
633 | 628 |
msgid "Not Scanned - StreamMaxLength exceeded" |
634 | 629 |
msgstr "" |
635 | 630 |
|
636 |
-#: clamav-milter.c:2480 |
|
631 |
+#: clamav-milter.c:2492 |
|
637 | 632 |
#, c-format |
638 | 633 |
msgid "Failed to delete X-Virus-Status header %d" |
639 | 634 |
msgstr "" |
640 | 635 |
|
641 |
-#: clamav-milter.c:2541 |
|
636 |
+#: clamav-milter.c:2555 |
|
642 | 637 |
#, c-format |
643 | 638 |
msgid "failed to send SCAN %s command to clamd" |
644 | 639 |
msgstr "" |
645 | 640 |
|
646 |
-#: clamav-milter.c:2563 |
|
641 |
+#: clamav-milter.c:2577 |
|
647 | 642 |
msgid "failed to send SCAN command to clamd" |
648 | 643 |
msgstr "" |
649 | 644 |
|
650 |
-#: clamav-milter.c:2580 |
|
645 |
+#: clamav-milter.c:2594 |
|
651 | 646 |
#, c-format |
652 | 647 |
msgid "Waiting to read status from fd %d\n" |
653 | 648 |
msgstr "" |
654 | 649 |
|
655 |
-#: clamav-milter.c:2593 |
|
650 |
+#: clamav-milter.c:2607 |
|
656 | 651 |
#, c-format |
657 | 652 |
msgid "clamfi_eom: read %s" |
658 | 653 |
msgstr "" |
659 | 654 |
|
660 |
-#: clamav-milter.c:2594 |
|
655 |
+#: clamav-milter.c:2608 |
|
661 | 656 |
#, c-format |
662 | 657 |
msgid "clamfi_eom: read %s\n" |
663 | 658 |
msgstr "" |
664 | 659 |
|
665 |
-#: clamav-milter.c:2611 |
|
660 |
+#: clamav-milter.c:2625 |
|
666 | 661 |
#, c-format |
667 | 662 |
msgid "clamfi_eom: read nothing from clamd on %s" |
668 | 663 |
msgstr "" |
669 | 664 |
|
670 |
-#: clamav-milter.c:2613 |
|
665 |
+#: clamav-milter.c:2627 |
|
671 | 666 |
#, c-format |
672 | 667 |
msgid "clamfi_eom: read nothing from clamd on %s\n" |
673 | 668 |
msgstr "" |
674 | 669 |
|
675 |
-#: clamav-milter.c:2658 clamav-milter.c:2704 |
|
670 |
+#: clamav-milter.c:2672 clamav-milter.c:2718 |
|
676 | 671 |
msgid "Error determining host" |
677 | 672 |
msgstr "" |
678 | 673 |
|
679 |
-#: clamav-milter.c:2723 |
|
674 |
+#: clamav-milter.c:2737 |
|
680 | 675 |
msgid "Not Scanned" |
681 | 676 |
msgstr "" |
682 | 677 |
|
683 |
-#: clamav-milter.c:2752 |
|
678 |
+#: clamav-milter.c:2766 |
|
684 | 679 |
msgid "Infected with" |
685 | 680 |
msgstr "" |
686 | 681 |
|
687 |
-#: clamav-milter.c:2773 |
|
682 |
+#: clamav-milter.c:2787 |
|
688 | 683 |
#, c-format |
689 | 684 |
msgid "Intercepted virus from %s to" |
690 | 685 |
msgstr "" |
691 | 686 |
|
692 |
-#: clamav-milter.c:2866 |
|
687 |
+#: clamav-milter.c:2880 |
|
693 | 688 |
msgid "" |
694 | 689 |
"Subject: Virus intercepted\n" |
695 | 690 |
"\n" |
696 | 691 |
msgstr "" |
697 | 692 |
|
698 |
-#: clamav-milter.c:2874 |
|
693 |
+#: clamav-milter.c:2888 |
|
699 | 694 |
msgid "A message you sent to\n" |
700 | 695 |
msgstr "" |
701 | 696 |
|
702 |
-#: clamav-milter.c:2881 |
|
697 |
+#: clamav-milter.c:2895 |
|
703 | 698 |
#, c-format |
704 | 699 |
msgid "The message %1$s sent from %2$s to\n" |
705 | 700 |
msgstr "" |
706 | 701 |
|
707 |
-#: clamav-milter.c:2884 |
|
702 |
+#: clamav-milter.c:2898 |
|
708 | 703 |
#, c-format |
709 | 704 |
msgid "A message sent from %s to\n" |
710 | 705 |
msgstr "" |
711 | 706 |
|
712 |
-#: clamav-milter.c:2889 |
|
707 |
+#: clamav-milter.c:2903 |
|
713 | 708 |
#, c-format |
714 | 709 |
msgid "contained %s and has not been delivered.\n" |
715 | 710 |
msgstr "" |
716 | 711 |
|
717 |
-#: clamav-milter.c:2892 |
|
712 |
+#: clamav-milter.c:2906 |
|
718 | 713 |
#, c-format |
719 | 714 |
msgid "" |
720 | 715 |
"\n" |
721 | 716 |
"The message in question has been quarantined as %s\n" |
722 | 717 |
msgstr "" |
723 | 718 |
|
724 |
-#: clamav-milter.c:2895 |
|
719 |
+#: clamav-milter.c:2909 |
|
725 | 720 |
#, c-format |
726 | 721 |
msgid "" |
727 | 722 |
"\n" |
... | ... |
@@ -729,13 +724,13 @@ msgid "" |
729 | 729 |
"\n" |
730 | 730 |
msgstr "" |
731 | 731 |
|
732 |
-#: clamav-milter.c:2898 |
|
732 |
+#: clamav-milter.c:2912 |
|
733 | 733 |
msgid "" |
734 | 734 |
"For your information, the original message headers were:\n" |
735 | 735 |
"\n" |
736 | 736 |
msgstr "" |
737 | 737 |
|
738 |
-#: clamav-milter.c:2911 |
|
738 |
+#: clamav-milter.c:2925 |
|
739 | 739 |
#, c-format |
740 | 740 |
msgid "" |
741 | 741 |
"\n" |
... | ... |
@@ -743,240 +738,240 @@ msgid "" |
743 | 743 |
"%s\t\n" |
744 | 744 |
msgstr "" |
745 | 745 |
|
746 |
-#: clamav-milter.c:2919 |
|
746 |
+#: clamav-milter.c:2933 |
|
747 | 747 |
#, c-format |
748 | 748 |
msgid "Can't execute '%s' to send virus notice" |
749 | 749 |
msgstr "" |
750 | 750 |
|
751 |
-#: clamav-milter.c:2924 |
|
751 |
+#: clamav-milter.c:2938 |
|
752 | 752 |
#, c-format |
753 | 753 |
msgid "Quarantined infected mail as %s" |
754 | 754 |
msgstr "" |
755 | 755 |
|
756 |
-#: clamav-milter.c:2948 |
|
756 |
+#: clamav-milter.c:2962 |
|
757 | 757 |
#, c-format |
758 | 758 |
msgid "Can't set quarantine user %s" |
759 | 759 |
msgstr "" |
760 | 760 |
|
761 |
-#: clamav-milter.c:2950 |
|
761 |
+#: clamav-milter.c:2964 |
|
762 | 762 |
#, c-format |
763 | 763 |
msgid "Can't set quarantine user %s\n" |
764 | 764 |
msgstr "" |
765 | 765 |
|
766 |
-#: clamav-milter.c:2975 |
|
766 |
+#: clamav-milter.c:2989 |
|
767 | 767 |
#, c-format |
768 | 768 |
msgid "virus %s detected by ClamAV - http://www.clamav.net" |
769 | 769 |
msgstr "" |
770 | 770 |
|
771 |
-#: clamav-milter.c:2980 |
|
771 |
+#: clamav-milter.c:2994 |
|
772 | 772 |
msgid "Unknown" |
773 | 773 |
msgstr "" |
774 | 774 |
|
775 |
-#: clamav-milter.c:2982 |
|
775 |
+#: clamav-milter.c:2996 |
|
776 | 776 |
#, c-format |
777 | 777 |
msgid "%s: incorrect message \"%s\" from clamd" |
778 | 778 |
msgstr "" |
779 | 779 |
|
780 |
-#: clamav-milter.c:2988 |
|
780 |
+#: clamav-milter.c:3002 |
|
781 | 781 |
msgid "Clean" |
782 | 782 |
msgstr "" |
783 | 783 |
|
784 |
-#: clamav-milter.c:2992 |
|
784 |
+#: clamav-milter.c:3006 |
|
785 | 785 |
#, c-format |
786 | 786 |
msgid "%s: clean message from %s" |
787 | 787 |
msgstr "" |
788 | 788 |
|
789 |
-#: clamav-milter.c:2994 |
|
789 |
+#: clamav-milter.c:3008 |
|
790 | 790 |
msgid "an unknown sender" |
791 | 791 |
msgstr "" |
792 | 792 |
|
793 |
-#: clamav-milter.c:3098 |
|
793 |
+#: clamav-milter.c:3112 |
|
794 | 794 |
#, c-format |
795 | 795 |
msgid "Can't remove clean file %s" |
796 | 796 |
msgstr "" |
797 | 797 |
|
798 |
-#: clamav-milter.c:3281 clamav-milter.c:3284 |
|
798 |
+#: clamav-milter.c:3295 clamav-milter.c:3298 |
|
799 | 799 |
#, c-format |
800 | 800 |
msgid "write failure (%u bytes) to %s: %s" |
801 | 801 |
msgstr "" |
802 | 802 |
|
803 |
-#: clamav-milter.c:3298 clamav-milter.c:3301 |
|
803 |
+#: clamav-milter.c:3312 clamav-milter.c:3315 |
|
804 | 804 |
#, c-format |
805 | 805 |
msgid "write failure (%u bytes) to clamd: %s" |
806 | 806 |
msgstr "" |
807 | 807 |
|
808 |
-#: clamav-milter.c:3367 |
|
808 |
+#: clamav-milter.c:3381 |
|
809 | 809 |
#, c-format |
810 | 810 |
msgid "No data received from clamd in %d seconds\n" |
811 | 811 |
msgstr "" |
812 | 812 |
|
813 |
-#: clamav-milter.c:3389 |
|
813 |
+#: clamav-milter.c:3403 |
|
814 | 814 |
#, c-format |
815 | 815 |
msgid "Can't stat %s" |
816 | 816 |
msgstr "" |
817 | 817 |
|
818 |
-#: clamav-milter.c:3400 clamav-milter.c:3831 |
|
818 |
+#: clamav-milter.c:3414 clamav-milter.c:3855 |
|
819 | 819 |
#, c-format |
820 | 820 |
msgid "Can't open %s" |
821 | 821 |
msgstr "" |
822 | 822 |
|
823 |
-#: clamav-milter.c:3515 clamav-milter.c:3995 |
|
823 |
+#: clamav-milter.c:3539 clamav-milter.c:4024 |
|
824 | 824 |
#, c-format |
825 | 825 |
msgid "mkdir %s failed" |
826 | 826 |
msgstr "" |
827 | 827 |
|
828 |
-#: clamav-milter.c:3527 |
|
828 |
+#: clamav-milter.c:3551 |
|
829 | 829 |
#, c-format |
830 | 830 |
msgid "mktemp %s failed" |
831 | 831 |
msgstr "" |
832 | 832 |
|
833 |
-#: clamav-milter.c:3537 |
|
833 |
+#: clamav-milter.c:3561 |
|
834 | 834 |
#, c-format |
835 | 835 |
msgid "Temporary quarantine file %s creation failed" |
836 | 836 |
msgstr "" |
837 | 837 |
|
838 |
-#: clamav-milter.c:3640 |
|
838 |
+#: clamav-milter.c:3664 |
|
839 | 839 |
#, c-format |
840 | 840 |
msgid "failed to send STREAM command clamd server %d" |
841 | 841 |
msgstr "" |
842 | 842 |
|
843 |
-#: clamav-milter.c:3649 |
|
843 |
+#: clamav-milter.c:3673 |
|
844 | 844 |
msgid "failed to send STREAM command clamd" |
845 | 845 |
msgstr "" |
846 | 846 |
|
847 |
-#: clamav-milter.c:3661 |
|
847 |
+#: clamav-milter.c:3685 |
|
848 | 848 |
msgid "failed to create TCPSocket to talk to clamd" |
849 | 849 |
msgstr "" |
850 | 850 |
|
851 |
-#: clamav-milter.c:3673 clamav-milter.c:3689 |
|
851 |
+#: clamav-milter.c:3697 clamav-milter.c:3713 |
|
852 | 852 |
msgid "recv failed from clamd getting PORT" |
853 | 853 |
msgstr "" |
854 | 854 |
|
855 |
-#: clamav-milter.c:3677 clamav-milter.c:3691 |
|
855 |
+#: clamav-milter.c:3701 clamav-milter.c:3715 |
|
856 | 856 |
msgid "EOF from clamd getting PORT" |
857 | 857 |
msgstr "" |
858 | 858 |
|
859 |
-#: clamav-milter.c:3702 |
|
859 |
+#: clamav-milter.c:3726 |
|
860 | 860 |
#, c-format |
861 | 861 |
msgid "Expected port information from clamd, got '%s'" |
862 | 862 |
msgstr "" |
863 | 863 |
|
864 |
-#: clamav-milter.c:3705 |
|
864 |
+#: clamav-milter.c:3729 |
|
865 | 865 |
#, c-format |
866 | 866 |
msgid "Expected port information from clamd, got '%s'\n" |
867 | 867 |
msgstr "" |
868 | 868 |
|
869 |
-#: clamav-milter.c:3725 clamav-milter.c:3728 |
|
869 |
+#: clamav-milter.c:3749 clamav-milter.c:3752 |
|
870 | 870 |
#, c-format |
871 | 871 |
msgid "Connecting to local port %d - data %d cmd %d\n" |
872 | 872 |
msgstr "" |
873 | 873 |
|
874 |
-#: clamav-milter.c:3743 clamav-milter.c:3746 |
|
874 |
+#: clamav-milter.c:3767 clamav-milter.c:3770 |
|
875 | 875 |
#, c-format |
876 | 876 |
msgid "Failed to connect to port %d given by clamd: %s" |
877 | 877 |
msgstr "" |
878 | 878 |
|
879 |
-#: clamav-milter.c:3843 |
|
879 |
+#: clamav-milter.c:3867 |
|
880 | 880 |
#, c-format |
881 | 881 |
msgid "Clamd (pid %d) seems to have died" |
882 | 882 |
msgstr "" |
883 | 883 |
|
884 |
-#: clamav-milter.c:3869 |
|
884 |
+#: clamav-milter.c:3893 |
|
885 | 885 |
#, c-format |
886 | 886 |
msgid "Can't open e-mail template file %s" |
887 | 887 |
msgstr "" |
888 | 888 |
|
889 |
-#: clamav-milter.c:3878 |
|
889 |
+#: clamav-milter.c:3902 |
|
890 | 890 |
#, c-format |
891 | 891 |
msgid "Can't stat e-mail template file %s" |
892 | 892 |
msgstr "" |
893 | 893 |
|
894 |
-#: clamav-milter.c:3887 |
|
894 |
+#: clamav-milter.c:3911 |
|
895 | 895 |
msgid "Out of memory" |
896 | 896 |
msgstr "" |
897 | 897 |
|
898 |
-#: clamav-milter.c:3914 |
|
898 |
+#: clamav-milter.c:3938 |
|
899 | 899 |
#, c-format |
900 | 900 |
msgid "%s: Unknown clamAV variable \"%c\"\n" |
901 | 901 |
msgstr "" |
902 | 902 |
|
903 |
-#: clamav-milter.c:3925 |
|
903 |
+#: clamav-milter.c:3949 |
|
904 | 904 |
#, c-format |
905 | 905 |
msgid "%s: Unterminated sendmail variable \"%s\"\n" |
906 | 906 |
msgstr "" |
907 | 907 |
|
908 |
-#: clamav-milter.c:3936 |
|
908 |
+#: clamav-milter.c:3960 |
|
909 | 909 |
#, c-format |
910 | 910 |
msgid "%s: Unknown sendmail variable \"%s\"\n" |
911 | 911 |
msgstr "" |
912 | 912 |
|
913 |
-#: clamav-milter.c:4021 |
|
913 |
+#: clamav-milter.c:4050 |
|
914 | 914 |
#, c-format |
915 | 915 |
msgid "Can't rename %1$s to %2$s" |
916 | 916 |
msgstr "" |
917 | 917 |
|
918 |
-#: clamav-milter.c:4030 |
|
918 |
+#: clamav-milter.c:4059 |
|
919 | 919 |
#, c-format |
920 | 920 |
msgid "File quarantined as %s" |
921 | 921 |
msgstr "" |
922 | 922 |
|
923 |
-#: clamav-milter.c:4122 |
|
923 |
+#: clamav-milter.c:4151 |
|
924 | 924 |
#, c-format |
925 | 925 |
msgid "[Virus] %s" |
926 | 926 |
msgstr "" |
927 | 927 |
|
928 |
-#: clamav-milter.c:4216 |
|
928 |
+#: clamav-milter.c:4245 |
|
929 | 929 |
msgid "" |
930 | 930 |
"No response from any clamd server - your AV system is not scanning emails\n" |
931 | 931 |
msgstr "" |
932 | 932 |
|
933 |
-#: clamav-milter.c:4219 |
|
933 |
+#: clamav-milter.c:4248 |
|
934 | 934 |
msgid "" |
935 | 935 |
"No response from any clamd server - your AV system is not scanning emails" |
936 | 936 |
msgstr "" |
937 | 937 |
|
938 |
-#: clamav-milter.c:4237 |
|
938 |
+#: clamav-milter.c:4266 |
|
939 | 939 |
msgid "Subject: ClamAV Down\n" |
940 | 940 |
msgstr "" |
941 | 941 |
|
942 |
-#: clamav-milter.c:4240 |
|
942 |
+#: clamav-milter.c:4269 |
|
943 | 943 |
msgid "" |
944 | 944 |
"This is an automatic message\n" |
945 | 945 |
"\n" |
946 | 946 |
msgstr "" |
947 | 947 |
|
948 |
-#: clamav-milter.c:4243 |
|
948 |
+#: clamav-milter.c:4272 |
|
949 | 949 |
msgid "The clamd program cannot be contacted.\n" |
950 | 950 |
msgstr "" |
951 | 951 |
|
952 |
-#: clamav-milter.c:4245 |
|
952 |
+#: clamav-milter.c:4274 |
|
953 | 953 |
msgid "No clamd server can be contacted.\n" |
954 | 954 |
msgstr "" |
955 | 955 |
|
956 |
-#: clamav-milter.c:4247 |
|
956 |
+#: clamav-milter.c:4276 |
|
957 | 957 |
msgid "Emails may not be being scanned, please check your servers.\n" |
958 | 958 |
msgstr "" |
959 | 959 |
|
960 |
-#: clamav-milter.c:4327 clamav-milter.c:4350 clamav-milter.c:4516 |
|
961 |
-#: clamav-milter.c:4537 |
|
960 |
+#: clamav-milter.c:4356 clamav-milter.c:4379 clamav-milter.c:4545 |
|
961 |
+#: clamav-milter.c:4566 |
|
962 | 962 |
msgid "Loading new database" |
963 | 963 |
msgstr "" |
964 | 964 |
|
965 |
-#: clamav-milter.c:4657 |
|
965 |
+#: clamav-milter.c:4686 |
|
966 | 966 |
#, c-format |
967 | 967 |
msgid "Stopping %s" |
968 | 968 |
msgstr "" |
969 | 969 |
|
970 |
-#: clamav-milter.c:4703 |
|
970 |
+#: clamav-milter.c:4732 |
|
971 | 971 |
msgid "Stopping clamav-milter" |
972 | 972 |
msgstr "" |
973 | 973 |
|
974 |
-#: clamav-milter.c:4821 |
|
974 |
+#: clamav-milter.c:4850 |
|
975 | 975 |
#, c-format |
976 | 976 |
msgid "ClamAV: Protecting against %u viruses" |
977 | 977 |
msgstr "" |
978 | 978 |
|
979 |
-#: clamav-milter.c:4826 |
|
979 |
+#: clamav-milter.c:4855 |
|
980 | 980 |
#, c-format |
981 | 981 |
msgid "Loaded %s" |
982 | 982 |
msgstr "" |