Browse code
Fix DNS error messages
git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1242 77e5149b-7576-45b1-b177-96237e5ba77b
Nigel Horne authored on 2005/01/12 18:00:04Showing 4 changed files
| ... | ... |
@@ -1,3 +1,9 @@ |
| 1 |
+Wed Jan 12 08:58:29 GMT 2005 (njh) |
|
| 2 |
+---------------------------------- |
|
| 3 |
+ * clamav-milter: Fixed DNS resolution error messages which could print |
|
| 4 |
+ the incorrect hostname that is not being resolved. Patch from |
|
| 5 |
+ Yar Tikhiy <yar@comp.chem.msu.su> |
|
| 6 |
+ |
|
| 1 | 7 |
Tue Jan 11 20:24:36 CET 2005 (tk) |
| 2 | 8 |
--------------------------------- |
| 3 | 9 |
* docs: Fix small typos in man pages (reported by Luca) |
| ... | ... |
@@ -638,6 +638,8 @@ Changes |
| 638 | 638 |
and neither max-children nor MaxThreads is set. |
| 639 | 639 |
0.80ff 21/12/04: Fault tolerance - sometimes attempted to get a STREAM |
| 640 | 640 |
from a server that is down |
| 641 |
+0.80gg 12/1/05: Fixed DNS resolution error messages which could print |
|
| 642 |
+ the incorrect hostname that is not being resolved |
|
| 641 | 643 |
|
| 642 | 644 |
INTERNATIONALISATION |
| 643 | 645 |
|
| ... | ... |
@@ -26,6 +26,9 @@ |
| 26 | 26 |
* |
| 27 | 27 |
* Change History: |
| 28 | 28 |
* $Log: clamav-milter.c,v $ |
| 29 |
+ * Revision 1.168 2005/01/12 08:57:05 nigelhorne |
|
| 30 |
+ * Fix DNS error messages |
|
| 31 |
+ * |
|
| 29 | 32 |
* Revision 1.167 2004/12/21 22:39:04 nigelhorne |
| 30 | 33 |
* Tidy |
| 31 | 34 |
* |
| ... | ... |
@@ -512,9 +515,9 @@ |
| 512 | 512 |
* Revision 1.6 2003/09/28 16:37:23 nigelhorne |
| 513 | 513 |
* Added -f flag use MaxThreads if --max-children not set |
| 514 | 514 |
*/ |
| 515 |
-static char const rcsid[] = "$Id: clamav-milter.c,v 1.167 2004/12/21 22:39:04 nigelhorne Exp $"; |
|
| 515 |
+static char const rcsid[] = "$Id: clamav-milter.c,v 1.168 2005/01/12 08:57:05 nigelhorne Exp $"; |
|
| 516 | 516 |
|
| 517 |
-#define CM_VERSION "0.80ff" |
|
| 517 |
+#define CM_VERSION "0.80gg" |
|
| 518 | 518 |
|
| 519 | 519 |
#if HAVE_CONFIG_H |
| 520 | 520 |
#include "clamav-config.h" |
| ... | ... |
@@ -906,7 +909,7 @@ static const char *ignoredEmailAddresses[] = {
|
| 906 | 906 |
#include <execinfo.h> |
| 907 | 907 |
|
| 908 | 908 |
static void sigsegv(int sig); |
| 909 |
-static void print_trace(int use_syslog); |
|
| 909 |
+static void print_trace(void); |
|
| 910 | 910 |
|
| 911 | 911 |
#define BACKTRACE_SIZE 200 |
| 912 | 912 |
|
| ... | ... |
@@ -2338,10 +2341,14 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr) |
| 2338 | 2338 |
syslog(LOG_ERR, _("Can't get sendmail hostname"));
|
| 2339 | 2339 |
return cl_error; |
| 2340 | 2340 |
} |
| 2341 |
+ /* |
|
| 2342 |
+ * Use hostmail for error statements, not hostname, suggestion |
|
| 2343 |
+ * by Yar Tikhiy <yar@comp.chem.msu.su> |
|
| 2344 |
+ */ |
|
| 2341 | 2345 |
if(clamfi_gethostbyname(hostmail, &hostent, buf, sizeof(buf)) != 0) {
|
| 2342 | 2346 |
if(use_syslog) |
| 2343 |
- syslog(LOG_WARNING, _("Access Denied: Host Unknown (%s)"), hostname);
|
|
| 2344 |
- if(hostname[0] == '[') |
|
| 2347 |
+ syslog(LOG_WARNING, _("Access Denied: Host Unknown (%s)"), hostmail);
|
|
| 2348 |
+ if(hostmail[0] == '[') |
|
| 2345 | 2349 |
/* |
| 2346 | 2350 |
* A case could be made that it's not clamAV's |
| 2347 | 2351 |
* job to check a system's DNS configuration |
| ... | ... |
@@ -2350,7 +2357,7 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr) |
| 2350 | 2350 |
* to do that... |
| 2351 | 2351 |
*/ |
| 2352 | 2352 |
cli_warnmsg(_("Can't find entry for IP address %s in DNS - check your DNS setting\n"),
|
| 2353 |
- hostname); |
|
| 2353 |
+ hostmail); |
|
| 2354 | 2354 |
return cl_error; |
| 2355 | 2355 |
} |
| 2356 | 2356 |
|
| ... | ... |
@@ -4931,7 +4938,7 @@ static void |
| 4931 | 4931 |
sigsegv(int sig) |
| 4932 | 4932 |
{
|
| 4933 | 4933 |
signal(SIGSEGV, SIG_DFL); |
| 4934 |
- print_trace(1); |
|
| 4934 |
+ print_trace(); |
|
| 4935 | 4935 |
if(use_syslog) |
| 4936 | 4936 |
syslog(LOG_ERR, "Segmentation fault :-( Bye.."); |
| 4937 | 4937 |
cli_dbgmsg("Segmentation fault :-( Bye..\n");
|
| ... | ... |
@@ -4940,7 +4947,7 @@ sigsegv(int sig) |
| 4940 | 4940 |
} |
| 4941 | 4941 |
|
| 4942 | 4942 |
static void |
| 4943 |
-print_trace(int use_syslog) |
|
| 4943 |
+print_trace(void) |
|
| 4944 | 4944 |
{
|
| 4945 | 4945 |
void *array[BACKTRACE_SIZE]; |
| 4946 | 4946 |
size_t size, i; |
| ... | ... |
@@ -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-12-14 10:43+0000\n" |
|
| 11 |
+"POT-Creation-Date: 2005-01-12 08:53+0000\n" |
|
| 12 | 12 |
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 13 | 13 |
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 14 | 14 |
"Language-Team: LANGUAGE <LL@li.org>\n" |
| ... | ... |
@@ -16,626 +16,630 @@ msgstr "" |
| 16 | 16 |
"Content-Type: text/plain; charset=CHARSET\n" |
| 17 | 17 |
"Content-Transfer-Encoding: 8bit\n" |
| 18 | 18 |
|
| 19 |
-#: clamav-milter.c:892 |
|
| 19 |
+#: clamav-milter.c:921 |
|
| 20 | 20 |
msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them." |
| 21 | 21 |
msgstr "" |
| 22 | 22 |
|
| 23 |
-#: clamav-milter.c:893 |
|
| 23 |
+#: clamav-milter.c:922 |
|
| 24 | 24 |
msgid "\t--bounce\t\t-b\tSend a failure message to the sender." |
| 25 | 25 |
msgstr "" |
| 26 | 26 |
|
| 27 |
-#: clamav-milter.c:894 |
|
| 27 |
+#: clamav-milter.c:923 |
|
| 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:895 |
|
| 33 |
+#: clamav-milter.c:924 |
|
| 34 | 34 |
msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE." |
| 35 | 35 |
msgstr "" |
| 36 | 36 |
|
| 37 |
-#: clamav-milter.c:896 |
|
| 37 |
+#: clamav-milter.c:925 |
|
| 38 | 38 |
msgid "\t--debug\t\t\t-D\tPrint debug messages." |
| 39 | 39 |
msgstr "" |
| 40 | 40 |
|
| 41 |
-#: clamav-milter.c:897 |
|
| 41 |
+#: clamav-milter.c:926 |
|
| 42 | 42 |
msgid "" |
| 43 | 43 |
"\t--dont-log-clean\t-C\tDon't add an entry to syslog that a mail is clean." |
| 44 | 44 |
msgstr "" |
| 45 | 45 |
|
| 46 |
-#: clamav-milter.c:898 |
|
| 46 |
+#: clamav-milter.c:927 |
|
| 47 | 47 |
msgid "" |
| 48 | 48 |
"\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error " |
| 49 | 49 |
"occurs." |
| 50 | 50 |
msgstr "" |
| 51 | 51 |
|
| 52 |
-#: clamav-milter.c:899 |
|
| 52 |
+#: clamav-milter.c:928 |
|
| 53 | 53 |
msgid "\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded." |
| 54 | 54 |
msgstr "" |
| 55 | 55 |
|
| 56 |
-#: clamav-milter.c:900 |
|
| 56 |
+#: clamav-milter.c:929 |
|
| 57 | 57 |
msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here." |
| 58 | 58 |
msgstr "" |
| 59 | 59 |
|
| 60 |
-#: clamav-milter.c:901 |
|
| 60 |
+#: clamav-milter.c:930 |
|
| 61 | 61 |
msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)." |
| 62 | 62 |
msgstr "" |
| 63 | 63 |
|
| 64 |
-#: clamav-milter.c:902 |
|
| 64 |
+#: clamav-milter.c:931 |
|
| 65 | 65 |
msgid "\t--help\t\t\t-h\tThis message." |
| 66 | 66 |
msgstr "" |
| 67 | 67 |
|
| 68 |
-#: clamav-milter.c:903 |
|
| 68 |
+#: clamav-milter.c:932 |
|
| 69 | 69 |
msgid "\t--headers\t\t-H\tInclude original message headers in the report." |
| 70 | 70 |
msgstr "" |
| 71 | 71 |
|
| 72 |
-#: clamav-milter.c:904 |
|
| 72 |
+#: clamav-milter.c:933 |
|
| 73 | 73 |
msgid "\t--internal\t\t-I\tUse the internal scanner." |
| 74 | 74 |
msgstr "" |
| 75 | 75 |
|
| 76 |
-#: clamav-milter.c:905 |
|
| 76 |
+#: clamav-milter.c:934 |
|
| 77 | 77 |
msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN." |
| 78 | 78 |
msgstr "" |
| 79 | 79 |
|
| 80 |
-#: clamav-milter.c:906 |
|
| 80 |
+#: clamav-milter.c:935 |
|
| 81 | 81 |
msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans." |
| 82 | 82 |
msgstr "" |
| 83 | 83 |
|
| 84 |
-#: clamav-milter.c:907 |
|
| 84 |
+#: clamav-milter.c:936 |
|
| 85 | 85 |
msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine." |
| 86 | 86 |
msgstr "" |
| 87 | 87 |
|
| 88 |
-#: clamav-milter.c:908 |
|
| 88 |
+#: clamav-milter.c:937 |
|
| 89 | 89 |
msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away." |
| 90 | 90 |
msgstr "" |
| 91 | 91 |
|
| 92 |
-#: clamav-milter.c:909 |
|
| 92 |
+#: clamav-milter.c:938 |
|
| 93 | 93 |
msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers." |
| 94 | 94 |
msgstr "" |
| 95 | 95 |
|
| 96 |
-#: clamav-milter.c:910 |
|
| 96 |
+#: clamav-milter.c:939 |
|
| 97 | 97 |
msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile." |
| 98 | 98 |
msgstr "" |
| 99 | 99 |
|
| 100 |
-#: clamav-milter.c:911 |
|
| 100 |
+#: clamav-milter.c:940 |
|
| 101 | 101 |
msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]." |
| 102 | 102 |
msgstr "" |
| 103 | 103 |
|
| 104 |
-#: clamav-milter.c:912 |
|
| 104 |
+#: clamav-milter.c:941 |
|
| 105 | 105 |
msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster." |
| 106 | 106 |
msgstr "" |
| 107 | 107 |
|
| 108 |
-#: clamav-milter.c:913 |
|
| 108 |
+#: clamav-milter.c:942 |
|
| 109 | 109 |
msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions." |
| 110 | 110 |
msgstr "" |
| 111 | 111 |
|
| 112 |
-#: clamav-milter.c:914 |
|
| 112 |
+#: clamav-milter.c:943 |
|
| 113 | 113 |
msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account." |
| 114 | 114 |
msgstr "" |
| 115 | 115 |
|
| 116 |
-#: clamav-milter.c:915 |
|
| 116 |
+#: clamav-milter.c:944 |
|
| 117 | 117 |
msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails." |
| 118 | 118 |
msgstr "" |
| 119 | 119 |
|
| 120 |
-#: clamav-milter.c:916 |
|
| 120 |
+#: clamav-milter.c:945 |
|
| 121 | 121 |
msgid "" |
| 122 | 122 |
"\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running " |
| 123 | 123 |
"clamd (when using TCPsocket)." |
| 124 | 124 |
msgstr "" |
| 125 | 125 |
|
| 126 |
-#: clamav-milter.c:917 |
|
| 126 |
+#: clamav-milter.c:946 |
|
| 127 | 127 |
msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message." |
| 128 | 128 |
msgstr "" |
| 129 | 129 |
|
| 130 |
-#: clamav-milter.c:918 |
|
| 130 |
+#: clamav-milter.c:947 |
|
| 131 | 131 |
msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file." |
| 132 | 132 |
msgstr "" |
| 133 | 133 |
|
| 134 |
-#: clamav-milter.c:919 |
|
| 134 |
+#: clamav-milter.c:948 |
|
| 135 | 135 |
msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file." |
| 136 | 136 |
msgstr "" |
| 137 | 137 |
|
| 138 |
-#: clamav-milter.c:920 |
|
| 138 |
+#: clamav-milter.c:949 |
|
| 139 | 139 |
msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die." |
| 140 | 140 |
msgstr "" |
| 141 | 141 |
|
| 142 |
-#: clamav-milter.c:921 |
|
| 142 |
+#: clamav-milter.c:950 |
|
| 143 | 143 |
msgid "\t--version\t\t-V\tPrint the version number of this software." |
| 144 | 144 |
msgstr "" |
| 145 | 145 |
|
| 146 |
-#: clamav-milter.c:923 |
|
| 146 |
+#: clamav-milter.c:952 |
|
| 147 | 147 |
msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'." |
| 148 | 148 |
msgstr "" |
| 149 | 149 |
|
| 150 |
-#: clamav-milter.c:925 |
|
| 150 |
+#: clamav-milter.c:954 |
|
| 151 | 151 |
msgid "" |
| 152 | 152 |
"\n" |
| 153 | 153 |
"For more information type \"man clamav-milter\"." |
| 154 | 154 |
msgstr "" |
| 155 | 155 |
|
| 156 |
-#: clamav-milter.c:926 |
|
| 156 |
+#: clamav-milter.c:955 |
|
| 157 | 157 |
msgid "Report bugs to bugs@clamav.net." |
| 158 | 158 |
msgstr "" |
| 159 | 159 |
|
| 160 |
-#: clamav-milter.c:1218 |
|
| 160 |
+#: clamav-milter.c:1247 |
|
| 161 | 161 |
#, c-format |
| 162 | 162 |
msgid "%s: No socket-addr given\n" |
| 163 | 163 |
msgstr "" |
| 164 | 164 |
|
| 165 |
-#: clamav-milter.c:1227 |
|
| 165 |
+#: clamav-milter.c:1256 |
|
| 166 | 166 |
#, c-format |
| 167 | 167 |
msgid "%s: Can't parse the config file %s\n" |
| 168 | 168 |
msgstr "" |
| 169 | 169 |
|
| 170 |
-#: clamav-milter.c:1266 |
|
| 170 |
+#: clamav-milter.c:1295 |
|
| 171 | 171 |
#, c-format |
| 172 | 172 |
msgid "" |
| 173 | 173 |
"%s: The iface option to --broadcast is not supported on your operating " |
| 174 | 174 |
"system\n" |
| 175 | 175 |
msgstr "" |
| 176 | 176 |
|
| 177 |
-#: clamav-milter.c:1275 |
|
| 177 |
+#: clamav-milter.c:1304 |
|
| 178 | 178 |
#, c-format |
| 179 | 179 |
msgid "%s: Can't get information about user %s\n" |
| 180 | 180 |
msgstr "" |
| 181 | 181 |
|
| 182 |
-#: clamav-milter.c:1286 |
|
| 182 |
+#: clamav-milter.c:1315 |
|
| 183 | 183 |
#, c-format |
| 184 | 184 |
msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n" |
| 185 | 185 |
msgstr "" |
| 186 | 186 |
|
| 187 |
-#: clamav-milter.c:1303 |
|
| 187 |
+#: clamav-milter.c:1332 |
|
| 188 | 188 |
#, c-format |
| 189 | 189 |
msgid "Running as user %s (UID %d, GID %d)\n" |
| 190 | 190 |
msgstr "" |
| 191 | 191 |
|
| 192 |
-#: clamav-milter.c:1306 |
|
| 192 |
+#: clamav-milter.c:1335 |
|
| 193 | 193 |
#, c-format |
| 194 | 194 |
msgid "%s: running as root is not recommended (check \"User\" in clamd.conf)\n" |
| 195 | 195 |
msgstr "" |
| 196 | 196 |
|
| 197 |
-#: clamav-milter.c:1308 |
|
| 197 |
+#: clamav-milter.c:1337 |
|
| 198 | 198 |
#, c-format |
| 199 | 199 |
msgid "%s: Only root can set an interface for --broadcast\n" |
| 200 | 200 |
msgstr "" |
| 201 | 201 |
|
| 202 |
-#: clamav-milter.c:1313 |
|
| 202 |
+#: clamav-milter.c:1342 |
|
| 203 | 203 |
#, c-format |
| 204 | 204 |
msgid "%s: Advisory mode doesn't work with quarantine mode\n" |
| 205 | 205 |
msgstr "" |
| 206 | 206 |
|
| 207 |
-#: clamav-milter.c:1321 |
|
| 207 |
+#: clamav-milter.c:1350 |
|
| 208 | 208 |
#, c-format |
| 209 | 209 |
msgid "%s: Advisory mode doesn't work with quarantine directories\n" |
| 210 | 210 |
msgstr "" |
| 211 | 211 |
|
| 212 |
-#: clamav-milter.c:1327 |
|
| 212 |
+#: clamav-milter.c:1356 |
|
| 213 | 213 |
#, c-format |
| 214 | 214 |
msgid "%s: the quarantine directory must not contain the string 'ERROR'\n" |
| 215 | 215 |
msgstr "" |
| 216 | 216 |
|
| 217 |
-#: clamav-milter.c:1333 |
|
| 217 |
+#: clamav-milter.c:1362 |
|
| 218 | 218 |
#, c-format |
| 219 | 219 |
msgid "%s: the quarantine directory must not contain the string 'FOUND'\n" |
| 220 | 220 |
msgstr "" |
| 221 | 221 |
|
| 222 |
-#: clamav-milter.c:1339 |
|
| 222 |
+#: clamav-milter.c:1368 |
|
| 223 | 223 |
#, c-format |
| 224 | 224 |
msgid "%s: the quarantine directory must not contain the string 'OK'\n" |
| 225 | 225 |
msgstr "" |
| 226 | 226 |
|
| 227 |
-#: clamav-milter.c:1356 |
|
| 227 |
+#: clamav-milter.c:1385 |
|
| 228 | 228 |
#, c-format |
| 229 | 229 |
msgid "%s: insecure quarantine directory %s (mode 0%o)\n" |
| 230 | 230 |
msgstr "" |
| 231 | 231 |
|
| 232 |
-#: clamav-milter.c:1382 |
|
| 232 |
+#: clamav-milter.c:1411 |
|
| 233 | 233 |
#, c-format |
| 234 | 234 |
msgid "%s: ReadTimeout must not be negative in %s\n" |
| 235 | 235 |
msgstr "" |
| 236 | 236 |
|
| 237 |
-#: clamav-milter.c:1390 |
|
| 237 |
+#: clamav-milter.c:1419 |
|
| 238 | 238 |
#, c-format |
| 239 | 239 |
msgid "%s: StreamMaxLength must not be negative in %s\n" |
| 240 | 240 |
msgstr "" |
| 241 | 241 |
|
| 242 |
-#: clamav-milter.c:1413 |
|
| 242 |
+#: clamav-milter.c:1442 |
|
| 243 | 243 |
#, c-format |
| 244 | 244 |
msgid "" |
| 245 | 245 |
"%s: (-q && !LogSyslog): warning - all interception message methods are off\n" |
| 246 | 246 |
msgstr "" |
| 247 | 247 |
|
| 248 |
-#: clamav-milter.c:1423 |
|
| 248 |
+#: clamav-milter.c:1452 |
|
| 249 | 249 |
#, c-format |
| 250 | 250 |
msgid "%s: ScanMail not defined in %s (needed with --internal)\n" |
| 251 | 251 |
msgstr "" |
| 252 | 252 |
|
| 253 |
-#: clamav-milter.c:1428 |
|
| 253 |
+#: clamav-milter.c:1457 |
|
| 254 | 254 |
#, c-format |
| 255 | 255 |
msgid "%s: --max-children must be given in internal mode\n" |
| 256 | 256 |
msgstr "" |
| 257 | 257 |
|
| 258 |
-#: clamav-milter.c:1432 |
|
| 258 |
+#: clamav-milter.c:1461 |
|
| 259 | 259 |
#, c-format |
| 260 | 260 |
msgid "%s: --timeout must not be given in internal mode\n" |
| 261 | 261 |
msgstr "" |
| 262 | 262 |
|
| 263 |
-#: clamav-milter.c:1445 |
|
| 263 |
+#: clamav-milter.c:1474 |
|
| 264 | 264 |
#, c-format |
| 265 | 265 |
msgid "%s: You can select one server type only (local/TCP) in %s\n" |
| 266 | 266 |
msgstr "" |
| 267 | 267 |
|
| 268 |
-#: clamav-milter.c:1455 |
|
| 268 |
+#: clamav-milter.c:1484 |
|
| 269 | 269 |
#, c-format |
| 270 | 270 |
msgid "The connection from sendmail to %s (%s) must not\n" |
| 271 | 271 |
msgstr "" |
| 272 | 272 |
|
| 273 |
-#: clamav-milter.c:1457 |
|
| 273 |
+#: clamav-milter.c:1486 |
|
| 274 | 274 |
#, c-format |
| 275 | 275 |
msgid "be the same as the connection to clamd (%s) in %s\n" |
| 276 | 276 |
msgstr "" |
| 277 | 277 |
|
| 278 |
-#: clamav-milter.c:1467 clamav-milter.c:1490 |
|
| 278 |
+#: clamav-milter.c:1496 clamav-milter.c:1519 |
|
| 279 | 279 |
#, c-format |
| 280 | 280 |
msgid "Can't talk to clamd server via %s\n" |
| 281 | 281 |
msgstr "" |
| 282 | 282 |
|
| 283 |
-#: clamav-milter.c:1469 clamav-milter.c:1492 |
|
| 283 |
+#: clamav-milter.c:1498 clamav-milter.c:1521 |
|
| 284 | 284 |
#, c-format |
| 285 | 285 |
msgid "Check your entry for LocalSocket in %s\n" |
| 286 | 286 |
msgstr "" |
| 287 | 287 |
|
| 288 |
-#: clamav-milter.c:1503 |
|
| 288 |
+#: clamav-milter.c:1532 |
|
| 289 | 289 |
msgid "Can't create a clamd session" |
| 290 | 290 |
msgstr "" |
| 291 | 291 |
|
| 292 |
-#: clamav-milter.c:1520 |
|
| 292 |
+#: clamav-milter.c:1549 |
|
| 293 | 293 |
#, c-format |
| 294 | 294 |
msgid "" |
| 295 | 295 |
"%s: --quarantine-dir not supported for remote scanning - use --quarantine\n" |
| 296 | 296 |
msgstr "" |
| 297 | 297 |
|
| 298 |
-#: clamav-milter.c:1535 |
|
| 298 |
+#: clamav-milter.c:1564 |
|
| 299 | 299 |
#, c-format |
| 300 | 300 |
msgid "%s: hostname %s is longer than %d characters\n" |
| 301 | 301 |
msgstr "" |
| 302 | 302 |
|
| 303 |
-#: clamav-milter.c:1554 |
|
| 303 |
+#: clamav-milter.c:1583 clamav-milter.c:1666 |
|
| 304 | 304 |
#, c-format |
| 305 | 305 |
msgid "%s: --max-children must be given in sessions mode\n" |
| 306 | 306 |
msgstr "" |
| 307 | 307 |
|
| 308 |
-#: clamav-milter.c:1577 |
|
| 308 |
+#: clamav-milter.c:1606 |
|
| 309 | 309 |
#, c-format |
| 310 | 310 |
msgid "%s: Unknown host %s\n" |
| 311 | 311 |
msgstr "" |
| 312 | 312 |
|
| 313 |
-#: clamav-milter.c:1589 |
|
| 313 |
+#: clamav-milter.c:1618 |
|
| 314 | 314 |
#, c-format |
| 315 | 315 |
msgid "Can't talk to clamd server %s on port %d\n" |
| 316 | 316 |
msgstr "" |
| 317 | 317 |
|
| 318 |
-#: clamav-milter.c:1606 |
|
| 318 |
+#: clamav-milter.c:1635 |
|
| 319 | 319 |
msgid "Can't find any active clamd servers\n" |
| 320 | 320 |
msgstr "" |
| 321 | 321 |
|
| 322 |
-#: clamav-milter.c:1607 clamav-milter.c:1613 |
|
| 322 |
+#: clamav-milter.c:1636 clamav-milter.c:1642 |
|
| 323 | 323 |
#, c-format |
| 324 | 324 |
msgid "Check your entry for TCPSocket in %s\n" |
| 325 | 325 |
msgstr "" |
| 326 | 326 |
|
| 327 |
-#: clamav-milter.c:1612 |
|
| 327 |
+#: clamav-milter.c:1641 |
|
| 328 | 328 |
msgid "Can't find any clamd servers\n" |
| 329 | 329 |
msgstr "" |
| 330 | 330 |
|
| 331 |
-#: clamav-milter.c:1619 |
|
| 331 |
+#: clamav-milter.c:1648 |
|
| 332 | 332 |
#, c-format |
| 333 | 333 |
msgid "%s: You must select server type (local/TCP) in %s\n" |
| 334 | 334 |
msgstr "" |
| 335 | 335 |
|
| 336 |
-#: clamav-milter.c:1675 |
|
| 336 |
+#: clamav-milter.c:1709 |
|
| 337 | 337 |
#, c-format |
| 338 | 338 |
msgid "When debugging it is recommended that you use Foreground mode in %s\n" |
| 339 | 339 |
msgstr "" |
| 340 | 340 |
|
| 341 |
-#: clamav-milter.c:1676 |
|
| 341 |
+#: clamav-milter.c:1710 |
|
| 342 | 342 |
msgid "\tso that you can see all of the messages" |
| 343 | 343 |
msgstr "" |
| 344 | 344 |
|
| 345 |
-#: clamav-milter.c:1777 |
|
| 345 |
+#: clamav-milter.c:1811 |
|
| 346 | 346 |
msgid "Starting clamav-milter" |
| 347 | 347 |
msgstr "" |
| 348 | 348 |
|
| 349 |
-#: clamav-milter.c:1786 |
|
| 349 |
+#: clamav-milter.c:1820 |
|
| 350 | 350 |
#, c-format |
| 351 | 351 |
msgid "Can't save PID in file %s" |
| 352 | 352 |
msgstr "" |
| 353 | 353 |
|
| 354 |
-#: clamav-milter.c:1788 |
|
| 354 |
+#: clamav-milter.c:1822 |
|
| 355 | 355 |
#, c-format |
| 356 | 356 |
msgid "Can't save PID in file %s\n" |
| 357 | 357 |
msgstr "" |
| 358 | 358 |
|
| 359 |
-#: clamav-milter.c:1821 |
|
| 359 |
+#: clamav-milter.c:1855 |
|
| 360 | 360 |
#, c-format |
| 361 | 361 |
msgid "%s: smfi_setconn failed\n" |
| 362 | 362 |
msgstr "" |
| 363 | 363 |
|
| 364 |
-#: clamav-milter.c:1835 |
|
| 364 |
+#: clamav-milter.c:1871 |
|
| 365 | 365 |
#, c-format |
| 366 | 366 |
msgid "Starting %s" |
| 367 | 367 |
msgstr "" |
| 368 | 368 |
|
| 369 |
-#: clamav-milter.c:1838 |
|
| 369 |
+#: clamav-milter.c:1874 |
|
| 370 | 370 |
msgid "Debugging is on" |
| 371 | 371 |
msgstr "" |
| 372 | 372 |
|
| 373 |
-#: clamav-milter.c:1895 clamav-milter.c:2152 |
|
| 373 |
+#: clamav-milter.c:1939 clamav-milter.c:2196 |
|
| 374 | 374 |
#, c-format |
| 375 | 375 |
msgid "Check clamd server %s - it may be down\n" |
| 376 | 376 |
msgstr "" |
| 377 | 377 |
|
| 378 |
-#: clamav-milter.c:1900 clamav-milter.c:2161 |
|
| 379 |
-msgid "Check clamd server - it may be down\n" |
|
| 378 |
+#: clamav-milter.c:1944 |
|
| 379 |
+msgid "Check clamd server - it may be down" |
|
| 380 | 380 |
msgstr "" |
| 381 | 381 |
|
| 382 |
-#: clamav-milter.c:2075 |
|
| 382 |
+#: clamav-milter.c:2119 |
|
| 383 | 383 |
msgid "No free clamd sessions\n" |
| 384 | 384 |
msgstr "" |
| 385 | 385 |
|
| 386 |
-#: clamav-milter.c:2155 |
|
| 386 |
+#: clamav-milter.c:2199 |
|
| 387 | 387 |
#, c-format |
| 388 | 388 |
msgid "Check clamd server %s - it may be down" |
| 389 | 389 |
msgstr "" |
| 390 | 390 |
|
| 391 |
-#: clamav-milter.c:2197 |
|
| 391 |
+#: clamav-milter.c:2205 |
|
| 392 |
+msgid "Check clamd server - it may be down\n" |
|
| 393 |
+msgstr "" |
|
| 394 |
+ |
|
| 395 |
+#: clamav-milter.c:2241 |
|
| 392 | 396 |
msgid "findServer: select failed" |
| 393 | 397 |
msgstr "" |
| 394 | 398 |
|
| 395 |
-#: clamav-milter.c:2206 |
|
| 399 |
+#: clamav-milter.c:2250 |
|
| 396 | 400 |
#, c-format |
| 397 | 401 |
msgid "findServer: using server %d\n" |
| 398 | 402 |
msgstr "" |
| 399 | 403 |
|
| 400 |
-#: clamav-milter.c:2211 |
|
| 404 |
+#: clamav-milter.c:2255 |
|
| 401 | 405 |
msgid "findServer: No response from any server\n" |
| 402 | 406 |
msgstr "" |
| 403 | 407 |
|
| 404 |
-#: clamav-milter.c:2213 |
|
| 408 |
+#: clamav-milter.c:2257 |
|
| 405 | 409 |
msgid "findServer: No response from any server" |
| 406 | 410 |
msgstr "" |
| 407 | 411 |
|
| 408 |
-#: clamav-milter.c:2234 |
|
| 412 |
+#: clamav-milter.c:2278 |
|
| 409 | 413 |
msgid "clamfi_connect: ctx is null" |
| 410 | 414 |
msgstr "" |
| 411 | 415 |
|
| 412 |
-#: clamav-milter.c:2239 |
|
| 416 |
+#: clamav-milter.c:2283 |
|
| 413 | 417 |
msgid "clamfi_connect: hostname is null" |
| 414 | 418 |
msgstr "" |
| 415 | 419 |
|
| 416 |
-#: clamav-milter.c:2260 |
|
| 420 |
+#: clamav-milter.c:2304 |
|
| 417 | 421 |
msgid "clamfi_connect: remoteIP is null" |
| 418 | 422 |
msgstr "" |
| 419 | 423 |
|
| 420 |
-#: clamav-milter.c:2269 |
|
| 424 |
+#: clamav-milter.c:2313 |
|
| 421 | 425 |
#, c-format |
| 422 | 426 |
msgid "clamfi_connect: connection from %s" |
| 423 | 427 |
msgstr "" |
| 424 | 428 |
|
| 425 |
-#: clamav-milter.c:2270 |
|
| 429 |
+#: clamav-milter.c:2314 |
|
| 426 | 430 |
#, c-format |
| 427 | 431 |
msgid "clamfi_connect: connection from %s\n" |
| 428 | 432 |
msgstr "" |
| 429 | 433 |
|
| 430 |
-#: clamav-milter.c:2273 |
|
| 434 |
+#: clamav-milter.c:2317 |
|
| 431 | 435 |
#, c-format |
| 432 | 436 |
msgid "clamfi_connect: connection from %s [%s]" |
| 433 | 437 |
msgstr "" |
| 434 | 438 |
|
| 435 |
-#: clamav-milter.c:2274 |
|
| 439 |
+#: clamav-milter.c:2318 |
|
| 436 | 440 |
#, c-format |
| 437 | 441 |
msgid "clamfi_connect: connection from %s [%s]\n" |
| 438 | 442 |
msgstr "" |
| 439 | 443 |
|
| 440 |
-#: clamav-milter.c:2294 |
|
| 444 |
+#: clamav-milter.c:2338 |
|
| 441 | 445 |
msgid "Can't get sendmail hostname" |
| 442 | 446 |
msgstr "" |
| 443 | 447 |
|
| 444 |
-#: clamav-milter.c:2299 |
|
| 448 |
+#: clamav-milter.c:2347 |
|
| 445 | 449 |
#, c-format |
| 446 | 450 |
msgid "Access Denied: Host Unknown (%s)" |
| 447 | 451 |
msgstr "" |
| 448 | 452 |
|
| 449 |
-#: clamav-milter.c:2308 |
|
| 453 |
+#: clamav-milter.c:2356 |
|
| 450 | 454 |
#, c-format |
| 451 | 455 |
msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n" |
| 452 | 456 |
msgstr "" |
| 453 | 457 |
|
| 454 |
-#: clamav-milter.c:2319 |
|
| 458 |
+#: clamav-milter.c:2367 |
|
| 455 | 459 |
#, c-format |
| 456 | 460 |
msgid "Access Denied: Can't get IP address for (%s)" |
| 457 | 461 |
msgstr "" |
| 458 | 462 |
|
| 459 |
-#: clamav-milter.c:2336 |
|
| 463 |
+#: clamav-milter.c:2384 |
|
| 460 | 464 |
#, c-format |
| 461 | 465 |
msgid "Access Denied for %s[%s]" |
| 462 | 466 |
msgstr "" |
| 463 | 467 |
|
| 464 |
-#: clamav-milter.c:2354 |
|
| 468 |
+#: clamav-milter.c:2402 |
|
| 465 | 469 |
msgid "clamfi_connect: not scanning outgoing messages" |
| 466 | 470 |
msgstr "" |
| 467 | 471 |
|
| 468 |
-#: clamav-milter.c:2355 |
|
| 472 |
+#: clamav-milter.c:2403 |
|
| 469 | 473 |
msgid "clamfi_connect: not scanning outgoing messages\n" |
| 470 | 474 |
msgstr "" |
| 471 | 475 |
|
| 472 |
-#: clamav-milter.c:2363 |
|
| 476 |
+#: clamav-milter.c:2411 |
|
| 473 | 477 |
msgid "clamfi_connect: not scanning local messages" |
| 474 | 478 |
msgstr "" |
| 475 | 479 |
|
| 476 |
-#: clamav-milter.c:2364 |
|
| 480 |
+#: clamav-milter.c:2412 |
|
| 477 | 481 |
msgid "clamfi_connect: not scanning local messages\n" |
| 478 | 482 |
msgstr "" |
| 479 | 483 |
|
| 480 |
-#: clamav-milter.c:2396 |
|
| 484 |
+#: clamav-milter.c:2444 |
|
| 481 | 485 |
#, c-format |
| 482 | 486 |
msgid "hit max-children limit (%u >= %u)\n" |
| 483 | 487 |
msgstr "" |
| 484 | 488 |
|
| 485 |
-#: clamav-milter.c:2397 |
|
| 489 |
+#: clamav-milter.c:2445 |
|
| 486 | 490 |
#, c-format |
| 487 | 491 |
msgid "hit max-children limit (%u >= %u): waiting for some to exit\n" |
| 488 | 492 |
msgstr "" |
| 489 | 493 |
|
| 490 |
-#: clamav-milter.c:2403 |
|
| 494 |
+#: clamav-milter.c:2451 |
|
| 491 | 495 |
#, c-format |
| 492 | 496 |
msgid "hit max-children limit (%u >= %u)" |
| 493 | 497 |
msgstr "" |
| 494 | 498 |
|
| 495 |
-#: clamav-milter.c:2404 |
|
| 499 |
+#: clamav-milter.c:2452 |
|
| 496 | 500 |
#, c-format |
| 497 | 501 |
msgid "hit max-children limit (%u >= %u): waiting for some to exit" |
| 498 | 502 |
msgstr "" |
| 499 | 503 |
|
| 500 |
-#: clamav-milter.c:2409 |
|
| 504 |
+#: clamav-milter.c:2457 |
|
| 501 | 505 |
msgid "AV system temporarily overloaded - please try later" |
| 502 | 506 |
msgstr "" |
| 503 | 507 |
|
| 504 |
-#: clamav-milter.c:2442 |
|
| 508 |
+#: clamav-milter.c:2490 |
|
| 505 | 509 |
#, c-format |
| 506 | 510 |
msgid ">n_children = %d\n" |
| 507 | 511 |
msgstr "" |
| 508 | 512 |
|
| 509 |
-#: clamav-milter.c:2448 |
|
| 513 |
+#: clamav-milter.c:2496 |
|
| 510 | 514 |
msgid "Timeout waiting for a child to die" |
| 511 | 515 |
msgstr "" |
| 512 | 516 |
|
| 513 |
-#: clamav-milter.c:2450 |
|
| 517 |
+#: clamav-milter.c:2498 |
|
| 514 | 518 |
msgid "Timeout waiting for a child to die\n" |
| 515 | 519 |
msgstr "" |
| 516 | 520 |
|
| 517 |
-#: clamav-milter.c:2560 |
|
| 521 |
+#: clamav-milter.c:2608 |
|
| 518 | 522 |
#, c-format |
| 519 | 523 |
msgid "Failed to delete X-Virus-Status header %d" |
| 520 | 524 |
msgstr "" |
| 521 | 525 |
|
| 522 |
-#: clamav-milter.c:2588 |
|
| 526 |
+#: clamav-milter.c:2636 |
|
| 523 | 527 |
msgid "clamfi_eoh" |
| 524 | 528 |
msgstr "" |
| 525 | 529 |
|
| 526 |
-#: clamav-milter.c:2591 |
|
| 530 |
+#: clamav-milter.c:2639 |
|
| 527 | 531 |
msgid "clamfi_eoh\n" |
| 528 | 532 |
msgstr "" |
| 529 | 533 |
|
| 530 |
-#: clamav-milter.c:2648 |
|
| 534 |
+#: clamav-milter.c:2696 |
|
| 531 | 535 |
msgid "clamfi_eoh: ignoring whitelisted message" |
| 532 | 536 |
msgstr "" |
| 533 | 537 |
|
| 534 |
-#: clamav-milter.c:2650 |
|
| 538 |
+#: clamav-milter.c:2698 |
|
| 535 | 539 |
msgid "clamfi_eoh: ignoring whitelisted message\n" |
| 536 | 540 |
msgstr "" |
| 537 | 541 |
|
| 538 |
-#: clamav-milter.c:2664 |
|
| 542 |
+#: clamav-milter.c:2712 |
|
| 539 | 543 |
#, c-format |
| 540 | 544 |
msgid "clamfi_envbody: %u bytes" |
| 541 | 545 |
msgstr "" |
| 542 | 546 |
|
| 543 |
-#: clamav-milter.c:2666 |
|
| 547 |
+#: clamav-milter.c:2714 |
|
| 544 | 548 |
#, c-format |
| 545 | 549 |
msgid "clamfi_envbody: %u bytes\n" |
| 546 | 550 |
msgstr "" |
| 547 | 551 |
|
| 548 |
-#: clamav-milter.c:2676 clamav-milter.c:2938 |
|
| 552 |
+#: clamav-milter.c:2724 clamav-milter.c:2986 |
|
| 549 | 553 |
#, c-format |
| 550 | 554 |
msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned" |
| 551 | 555 |
msgstr "" |
| 552 | 556 |
|
| 553 |
-#: clamav-milter.c:2680 clamav-milter.c:2941 |
|
| 557 |
+#: clamav-milter.c:2728 clamav-milter.c:2989 |
|
| 554 | 558 |
msgid "Not Scanned - StreamMaxLength exceeded" |
| 555 | 559 |
msgstr "" |
| 556 | 560 |
|
| 557 |
-#: clamav-milter.c:2778 |
|
| 561 |
+#: clamav-milter.c:2826 |
|
| 558 | 562 |
#, c-format |
| 559 | 563 |
msgid "failed to send SCAN %s command to clamd" |
| 560 | 564 |
msgstr "" |
| 561 | 565 |
|
| 562 |
-#: clamav-milter.c:2800 |
|
| 566 |
+#: clamav-milter.c:2848 |
|
| 563 | 567 |
msgid "failed to send SCAN command to clamd" |
| 564 | 568 |
msgstr "" |
| 565 | 569 |
|
| 566 |
-#: clamav-milter.c:2816 |
|
| 570 |
+#: clamav-milter.c:2864 |
|
| 567 | 571 |
#, c-format |
| 568 | 572 |
msgid "Wating to read status from fd %d\n" |
| 569 | 573 |
msgstr "" |
| 570 | 574 |
|
| 571 |
-#: clamav-milter.c:2827 |
|
| 575 |
+#: clamav-milter.c:2875 |
|
| 572 | 576 |
#, c-format |
| 573 | 577 |
msgid "clamfi_eom: read %s" |
| 574 | 578 |
msgstr "" |
| 575 | 579 |
|
| 576 |
-#: clamav-milter.c:2828 |
|
| 580 |
+#: clamav-milter.c:2876 |
|
| 577 | 581 |
#, c-format |
| 578 | 582 |
msgid "clamfi_eom: read %s\n" |
| 579 | 583 |
msgstr "" |
| 580 | 584 |
|
| 581 |
-#: clamav-milter.c:2836 |
|
| 585 |
+#: clamav-milter.c:2884 |
|
| 582 | 586 |
msgid "clamfi_eom: read nothing from clamd" |
| 583 | 587 |
msgstr "" |
| 584 | 588 |
|
| 585 |
-#: clamav-milter.c:2838 |
|
| 589 |
+#: clamav-milter.c:2886 |
|
| 586 | 590 |
msgid "clamfi_eom: read nothing from clamd\n" |
| 587 | 591 |
msgstr "" |
| 588 | 592 |
|
| 589 |
-#: clamav-milter.c:2883 clamav-milter.c:2927 |
|
| 593 |
+#: clamav-milter.c:2931 clamav-milter.c:2975 |
|
| 590 | 594 |
msgid "Error determining host" |
| 591 | 595 |
msgstr "" |
| 592 | 596 |
|
| 593 |
-#: clamav-milter.c:2946 |
|
| 597 |
+#: clamav-milter.c:2994 |
|
| 594 | 598 |
msgid "Not Scanned" |
| 595 | 599 |
msgstr "" |
| 596 | 600 |
|
| 597 |
-#: clamav-milter.c:2973 |
|
| 601 |
+#: clamav-milter.c:3021 |
|
| 598 | 602 |
msgid "Infected" |
| 599 | 603 |
msgstr "" |
| 600 | 604 |
|
| 601 |
-#: clamav-milter.c:2991 |
|
| 605 |
+#: clamav-milter.c:3040 |
|
| 602 | 606 |
#, c-format |
| 603 | 607 |
msgid "Intercepted virus from %s to" |
| 604 | 608 |
msgstr "" |
| 605 | 609 |
|
| 606 |
-#: clamav-milter.c:3088 |
|
| 610 |
+#: clamav-milter.c:3137 |
|
| 607 | 611 |
msgid "" |
| 608 | 612 |
"Subject: Virus intercepted\n" |
| 609 | 613 |
"\n" |
| 610 | 614 |
msgstr "" |
| 611 | 615 |
|
| 612 |
-#: clamav-milter.c:3110 |
|
| 616 |
+#: clamav-milter.c:3159 |
|
| 613 | 617 |
msgid "A message you sent to\n" |
| 614 | 618 |
msgstr "" |
| 615 | 619 |
|
| 616 |
-#: clamav-milter.c:3117 |
|
| 620 |
+#: clamav-milter.c:3166 |
|
| 617 | 621 |
#, c-format |
| 618 | 622 |
msgid "The message %1$s sent from %2$s to\n" |
| 619 | 623 |
msgstr "" |
| 620 | 624 |
|
| 621 |
-#: clamav-milter.c:3120 |
|
| 625 |
+#: clamav-milter.c:3169 |
|
| 622 | 626 |
#, c-format |
| 623 | 627 |
msgid "A message sent from %s to\n" |
| 624 | 628 |
msgstr "" |
| 625 | 629 |
|
| 626 |
-#: clamav-milter.c:3125 |
|
| 630 |
+#: clamav-milter.c:3174 |
|
| 627 | 631 |
#, c-format |
| 628 | 632 |
msgid "contained %s and has not been delivered.\n" |
| 629 | 633 |
msgstr "" |
| 630 | 634 |
|
| 631 |
-#: clamav-milter.c:3128 |
|
| 635 |
+#: clamav-milter.c:3177 |
|
| 632 | 636 |
#, c-format |
| 633 | 637 |
msgid "" |
| 634 | 638 |
"\n" |
| 635 | 639 |
"The message in question has been quarantined as %s\n" |
| 636 | 640 |
msgstr "" |
| 637 | 641 |
|
| 638 |
-#: clamav-milter.c:3131 |
|
| 642 |
+#: clamav-milter.c:3180 |
|
| 639 | 643 |
#, c-format |
| 640 | 644 |
msgid "" |
| 641 | 645 |
"\n" |
| ... | ... |
@@ -643,13 +647,13 @@ msgid "" |
| 643 | 643 |
"\n" |
| 644 | 644 |
msgstr "" |
| 645 | 645 |
|
| 646 |
-#: clamav-milter.c:3134 |
|
| 646 |
+#: clamav-milter.c:3183 |
|
| 647 | 647 |
msgid "" |
| 648 | 648 |
"For your information, the original message headers were:\n" |
| 649 | 649 |
"\n" |
| 650 | 650 |
msgstr "" |
| 651 | 651 |
|
| 652 |
-#: clamav-milter.c:3147 |
|
| 652 |
+#: clamav-milter.c:3196 |
|
| 653 | 653 |
#, c-format |
| 654 | 654 |
msgid "" |
| 655 | 655 |
"\n" |
| ... | ... |
@@ -657,234 +661,234 @@ msgid "" |
| 657 | 657 |
"%s\t\n" |
| 658 | 658 |
msgstr "" |
| 659 | 659 |
|
| 660 |
-#: clamav-milter.c:3158 |
|
| 660 |
+#: clamav-milter.c:3207 |
|
| 661 | 661 |
#, c-format |
| 662 | 662 |
msgid "Quarantined infected mail as %s" |
| 663 | 663 |
msgstr "" |
| 664 | 664 |
|
| 665 |
-#: clamav-milter.c:3182 |
|
| 665 |
+#: clamav-milter.c:3231 |
|
| 666 | 666 |
#, c-format |
| 667 | 667 |
msgid "Can't set quarantine user %s" |
| 668 | 668 |
msgstr "" |
| 669 | 669 |
|
| 670 |
-#: clamav-milter.c:3184 |
|
| 670 |
+#: clamav-milter.c:3233 |
|
| 671 | 671 |
#, c-format |
| 672 | 672 |
msgid "Can't set quarantine user %s\n" |
| 673 | 673 |
msgstr "" |
| 674 | 674 |
|
| 675 |
-#: clamav-milter.c:3197 |
|
| 675 |
+#: clamav-milter.c:3246 |
|
| 676 | 676 |
#, c-format |
| 677 | 677 |
msgid "virus %s detected by ClamAV - http://www.clamav.net" |
| 678 | 678 |
msgstr "" |
| 679 | 679 |
|
| 680 |
-#: clamav-milter.c:3202 |
|
| 680 |
+#: clamav-milter.c:3251 |
|
| 681 | 681 |
msgid "Unknown" |
| 682 | 682 |
msgstr "" |
| 683 | 683 |
|
| 684 |
-#: clamav-milter.c:3204 |
|
| 684 |
+#: clamav-milter.c:3253 |
|
| 685 | 685 |
#, c-format |
| 686 | 686 |
msgid "%s: incorrect message \"%s\" from clamd" |
| 687 | 687 |
msgstr "" |
| 688 | 688 |
|
| 689 |
-#: clamav-milter.c:3210 |
|
| 689 |
+#: clamav-milter.c:3259 |
|
| 690 | 690 |
msgid "Clean" |
| 691 | 691 |
msgstr "" |
| 692 | 692 |
|
| 693 |
-#: clamav-milter.c:3214 |
|
| 693 |
+#: clamav-milter.c:3263 |
|
| 694 | 694 |
#, c-format |
| 695 | 695 |
msgid "%s: clean message from %s" |
| 696 | 696 |
msgstr "" |
| 697 | 697 |
|
| 698 |
-#: clamav-milter.c:3216 |
|
| 698 |
+#: clamav-milter.c:3265 |
|
| 699 | 699 |
msgid "an unknown sender" |
| 700 | 700 |
msgstr "" |
| 701 | 701 |
|
| 702 |
-#: clamav-milter.c:3316 |
|
| 702 |
+#: clamav-milter.c:3369 |
|
| 703 | 703 |
#, c-format |
| 704 | 704 |
msgid "Can't remove clean file %s" |
| 705 | 705 |
msgstr "" |
| 706 | 706 |
|
| 707 |
-#: clamav-milter.c:3496 clamav-milter.c:3499 |
|
| 707 |
+#: clamav-milter.c:3550 clamav-milter.c:3553 |
|
| 708 | 708 |
#, c-format |
| 709 | 709 |
msgid "write failure (%u bytes) to %s: %s" |
| 710 | 710 |
msgstr "" |
| 711 | 711 |
|
| 712 |
-#: clamav-milter.c:3513 clamav-milter.c:3516 |
|
| 712 |
+#: clamav-milter.c:3567 clamav-milter.c:3570 |
|
| 713 | 713 |
#, c-format |
| 714 | 714 |
msgid "write failure (%u bytes) to clamd: %s" |
| 715 | 715 |
msgstr "" |
| 716 | 716 |
|
| 717 |
-#: clamav-milter.c:3582 |
|
| 717 |
+#: clamav-milter.c:3636 |
|
| 718 | 718 |
#, c-format |
| 719 | 719 |
msgid "No data received from clamd in %d seconds\n" |
| 720 | 720 |
msgstr "" |
| 721 | 721 |
|
| 722 |
-#: clamav-milter.c:3604 |
|
| 722 |
+#: clamav-milter.c:3658 |
|
| 723 | 723 |
#, c-format |
| 724 | 724 |
msgid "Can't stat %s" |
| 725 | 725 |
msgstr "" |
| 726 | 726 |
|
| 727 |
-#: clamav-milter.c:3615 clamav-milter.c:4034 |
|
| 727 |
+#: clamav-milter.c:3669 clamav-milter.c:4092 |
|
| 728 | 728 |
#, c-format |
| 729 | 729 |
msgid "Can't open %s" |
| 730 | 730 |
msgstr "" |
| 731 | 731 |
|
| 732 |
-#: clamav-milter.c:3731 clamav-milter.c:4199 |
|
| 732 |
+#: clamav-milter.c:3785 clamav-milter.c:4257 |
|
| 733 | 733 |
#, c-format |
| 734 | 734 |
msgid "mkdir %s failed" |
| 735 | 735 |
msgstr "" |
| 736 | 736 |
|
| 737 |
-#: clamav-milter.c:3743 |
|
| 737 |
+#: clamav-milter.c:3797 |
|
| 738 | 738 |
#, c-format |
| 739 | 739 |
msgid "mktemp %s failed" |
| 740 | 740 |
msgstr "" |
| 741 | 741 |
|
| 742 |
-#: clamav-milter.c:3753 |
|
| 742 |
+#: clamav-milter.c:3807 |
|
| 743 | 743 |
#, c-format |
| 744 | 744 |
msgid "Temporary quarantine file %s creation failed" |
| 745 | 745 |
msgstr "" |
| 746 | 746 |
|
| 747 |
-#: clamav-milter.c:3857 |
|
| 747 |
+#: clamav-milter.c:3911 |
|
| 748 | 748 |
#, c-format |
| 749 | 749 |
msgid "failed to send STREAM command clamd server %d" |
| 750 | 750 |
msgstr "" |
| 751 | 751 |
|
| 752 |
-#: clamav-milter.c:3866 |
|
| 752 |
+#: clamav-milter.c:3920 |
|
| 753 | 753 |
msgid "failed to send STREAM command clamd" |
| 754 | 754 |
msgstr "" |
| 755 | 755 |
|
| 756 |
-#: clamav-milter.c:3878 |
|
| 756 |
+#: clamav-milter.c:3932 |
|
| 757 | 757 |
msgid "failed to create TCPSocket to talk to clamd" |
| 758 | 758 |
msgstr "" |
| 759 | 759 |
|
| 760 |
-#: clamav-milter.c:3890 clamav-milter.c:3904 |
|
| 760 |
+#: clamav-milter.c:3944 clamav-milter.c:3960 |
|
| 761 | 761 |
msgid "recv failed from clamd getting PORT" |
| 762 | 762 |
msgstr "" |
| 763 | 763 |
|
| 764 |
-#: clamav-milter.c:3892 clamav-milter.c:3906 |
|
| 764 |
+#: clamav-milter.c:3948 clamav-milter.c:3962 |
|
| 765 | 765 |
msgid "EOF from clamd getting PORT" |
| 766 | 766 |
msgstr "" |
| 767 | 767 |
|
| 768 |
-#: clamav-milter.c:3917 |
|
| 768 |
+#: clamav-milter.c:3973 |
|
| 769 | 769 |
#, c-format |
| 770 | 770 |
msgid "Expected port information from clamd, got '%s'" |
| 771 | 771 |
msgstr "" |
| 772 | 772 |
|
| 773 |
-#: clamav-milter.c:3920 |
|
| 773 |
+#: clamav-milter.c:3976 |
|
| 774 | 774 |
#, c-format |
| 775 | 775 |
msgid "Expected port information from clamd, got '%s'\n" |
| 776 | 776 |
msgstr "" |
| 777 | 777 |
|
| 778 |
-#: clamav-milter.c:3940 clamav-milter.c:3943 |
|
| 778 |
+#: clamav-milter.c:3996 clamav-milter.c:3999 |
|
| 779 | 779 |
#, c-format |
| 780 | 780 |
msgid "Connecting to local port %d - data %d cmd %d\n" |
| 781 | 781 |
msgstr "" |
| 782 | 782 |
|
| 783 |
-#: clamav-milter.c:3956 clamav-milter.c:3959 |
|
| 783 |
+#: clamav-milter.c:4014 clamav-milter.c:4017 |
|
| 784 | 784 |
#, c-format |
| 785 | 785 |
msgid "Failed to connect to port %d given by clamd: %s" |
| 786 | 786 |
msgstr "" |
| 787 | 787 |
|
| 788 |
-#: clamav-milter.c:4046 |
|
| 788 |
+#: clamav-milter.c:4104 |
|
| 789 | 789 |
#, c-format |
| 790 | 790 |
msgid "Clamd (pid %d) seems to have died" |
| 791 | 791 |
msgstr "" |
| 792 | 792 |
|
| 793 |
-#: clamav-milter.c:4072 |
|
| 793 |
+#: clamav-milter.c:4130 |
|
| 794 | 794 |
#, c-format |
| 795 | 795 |
msgid "Can't open e-mail template file %s" |
| 796 | 796 |
msgstr "" |
| 797 | 797 |
|
| 798 |
-#: clamav-milter.c:4081 |
|
| 798 |
+#: clamav-milter.c:4139 |
|
| 799 | 799 |
#, c-format |
| 800 | 800 |
msgid "Can't stat e-mail template file %s" |
| 801 | 801 |
msgstr "" |
| 802 | 802 |
|
| 803 |
-#: clamav-milter.c:4090 |
|
| 803 |
+#: clamav-milter.c:4148 |
|
| 804 | 804 |
msgid "Out of memory" |
| 805 | 805 |
msgstr "" |
| 806 | 806 |
|
| 807 |
-#: clamav-milter.c:4117 |
|
| 807 |
+#: clamav-milter.c:4175 |
|
| 808 | 808 |
#, c-format |
| 809 | 809 |
msgid "%s: Unknown clamAV variable \"%c\"\n" |
| 810 | 810 |
msgstr "" |
| 811 | 811 |
|
| 812 |
-#: clamav-milter.c:4128 |
|
| 812 |
+#: clamav-milter.c:4186 |
|
| 813 | 813 |
#, c-format |
| 814 | 814 |
msgid "%s: Unterminated sendmail variable \"%s\"\n" |
| 815 | 815 |
msgstr "" |
| 816 | 816 |
|
| 817 |
-#: clamav-milter.c:4139 |
|
| 817 |
+#: clamav-milter.c:4197 |
|
| 818 | 818 |
#, c-format |
| 819 | 819 |
msgid "%s: Unknown sendmail variable \"%s\"\n" |
| 820 | 820 |
msgstr "" |
| 821 | 821 |
|
| 822 |
-#: clamav-milter.c:4226 |
|
| 822 |
+#: clamav-milter.c:4284 |
|
| 823 | 823 |
#, c-format |
| 824 | 824 |
msgid "Can't rename %1$s to %2$s" |
| 825 | 825 |
msgstr "" |
| 826 | 826 |
|
| 827 |
-#: clamav-milter.c:4235 |
|
| 827 |
+#: clamav-milter.c:4293 |
|
| 828 | 828 |
#, c-format |
| 829 | 829 |
msgid "File quarantined as %s" |
| 830 | 830 |
msgstr "" |
| 831 | 831 |
|
| 832 |
-#: clamav-milter.c:4327 |
|
| 832 |
+#: clamav-milter.c:4385 |
|
| 833 | 833 |
#, c-format |
| 834 | 834 |
msgid "[Virus] %s" |
| 835 | 835 |
msgstr "" |
| 836 | 836 |
|
| 837 |
-#: clamav-milter.c:4421 |
|
| 837 |
+#: clamav-milter.c:4479 |
|
| 838 | 838 |
msgid "" |
| 839 | 839 |
"No response from any clamd server - your AV system is not scanning emails\n" |
| 840 | 840 |
msgstr "" |
| 841 | 841 |
|
| 842 |
-#: clamav-milter.c:4424 |
|
| 842 |
+#: clamav-milter.c:4482 |
|
| 843 | 843 |
msgid "" |
| 844 | 844 |
"No response from any clamd server - your AV system is not scanning emails" |
| 845 | 845 |
msgstr "" |
| 846 | 846 |
|
| 847 |
-#: clamav-milter.c:4442 |
|
| 847 |
+#: clamav-milter.c:4500 |
|
| 848 | 848 |
msgid "Subject: ClamAV Down\n" |
| 849 | 849 |
msgstr "" |
| 850 | 850 |
|
| 851 |
-#: clamav-milter.c:4445 |
|
| 851 |
+#: clamav-milter.c:4503 |
|
| 852 | 852 |
msgid "" |
| 853 | 853 |
"This is an automatic message\n" |
| 854 | 854 |
"\n" |
| 855 | 855 |
msgstr "" |
| 856 | 856 |
|
| 857 |
-#: clamav-milter.c:4448 |
|
| 857 |
+#: clamav-milter.c:4506 |
|
| 858 | 858 |
msgid "The clamd program cannot be contacted.\n" |
| 859 | 859 |
msgstr "" |
| 860 | 860 |
|
| 861 |
-#: clamav-milter.c:4450 |
|
| 861 |
+#: clamav-milter.c:4508 |
|
| 862 | 862 |
msgid "No clamd server can be contacted.\n" |
| 863 | 863 |
msgstr "" |
| 864 | 864 |
|
| 865 |
-#: clamav-milter.c:4452 |
|
| 865 |
+#: clamav-milter.c:4510 |
|
| 866 | 866 |
msgid "Emails may not be being scanned, please check your servers.\n" |
| 867 | 867 |
msgstr "" |
| 868 | 868 |
|
| 869 |
-#: clamav-milter.c:4521 |
|
| 869 |
+#: clamav-milter.c:4579 |
|
| 870 | 870 |
msgid "Loading new database" |
| 871 | 871 |
msgstr "" |
| 872 | 872 |
|
| 873 |
-#: clamav-milter.c:4707 |
|
| 873 |
+#: clamav-milter.c:4767 |
|
| 874 | 874 |
#, c-format |
| 875 | 875 |
msgid "Stopping %s" |
| 876 | 876 |
msgstr "" |
| 877 | 877 |
|
| 878 |
-#: clamav-milter.c:4749 |
|
| 878 |
+#: clamav-milter.c:4811 |
|
| 879 | 879 |
msgid "Stopping clamav-milter" |
| 880 | 880 |
msgstr "" |
| 881 | 881 |
|
| 882 |
-#: clamav-milter.c:4856 |
|
| 882 |
+#: clamav-milter.c:4919 |
|
| 883 | 883 |
#, c-format |
| 884 | 884 |
msgid "ClamAV: Protecting against %u viruses" |
| 885 | 885 |
msgstr "" |
| 886 | 886 |
|
| 887 |
-#: clamav-milter.c:4859 |
|
| 887 |
+#: clamav-milter.c:4924 |
|
| 888 | 888 |
#, c-format |
| 889 |
-msgid "Loaded %s\n" |
|
| 889 |
+msgid "Loaded %s" |
|
| 890 | 890 |
msgstr "" |