Browse code
X-Virus-Status work
git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1299 77e5149b-7576-45b1-b177-96237e5ba77b
Nigel Horne authored on 2005/02/01 17:56:11Showing 4 changed files
| ... | ... |
@@ -1,3 +1,12 @@ |
| 1 |
+Tue Feb 1 08:54:46 GMT 2005 (njh) |
|
| 2 |
+---------------------------------- |
|
| 3 |
+ * clamav-milter: Delete X-Virus-Status in clamfi_eom not in |
|
| 4 |
+ clamfi_header. Patch by Jef Poskanzer |
|
| 5 |
+ <jef@acme.com> |
|
| 6 |
+ X-Virus-Status now says that virus that it's infected |
|
| 7 |
+ with. Suggestion by "Hank Beatty" |
|
| 8 |
+ <hbeatty@starband.net> |
|
| 9 |
+ |
|
| 1 | 10 |
Tue Feb 1 03:46:22 CET 2005 (tk) |
| 2 | 11 |
--------------------------------- |
| 3 | 12 |
* libclamav/readdb.c: s/cl_strerr/cl_strerror |
| ... | ... |
@@ -82,7 +91,7 @@ Wed Jan 26 17:40:56 CET 2005 (tk) |
| 82 | 82 |
|
| 83 | 83 |
Wed Jan 26 15:25:56 CET 2005 (tk) |
| 84 | 84 |
--------------------------------- |
| 85 |
- * freshclam/manager.c: wwwconnect(): use new socket after failure (patch by |
|
| 85 |
+ * freshclam/manager.c: wwwconnect(): use new socket after failure (patch by |
|
| 86 | 86 |
Geoff Gibbs <ggibbs*hgmp.mrc.ac.uk>) |
| 87 | 87 |
|
| 88 | 88 |
Wed Jan 26 15:10:02 CET 2005 (tk) |
| ... | ... |
@@ -669,6 +669,12 @@ Changes |
| 669 | 669 |
Sun's C compiler, patch by |
| 670 | 670 |
"Dugal James P." <jpd@louisiana.edu> |
| 671 | 671 |
SESSION is back on by default, to test clamd fix |
| 672 |
+0.81f 31/1/05: Delete X-Virus-Status in clamfi_eom not in |
|
| 673 |
+ clamfi_header, patch by Jef Poskanzer |
|
| 674 |
+ <jef@acme.com> |
|
| 675 |
+ X-Virus-Status now says that virus that it's infected |
|
| 676 |
+ with, suggestion by "Hank Beatty" |
|
| 677 |
+ <hbeatty@starband.net> |
|
| 672 | 678 |
|
| 673 | 679 |
INTERNATIONALISATION |
| 674 | 680 |
|
| ... | ... |
@@ -26,6 +26,9 @@ |
| 26 | 26 |
* |
| 27 | 27 |
* Change History: |
| 28 | 28 |
* $Log: clamav-milter.c,v $ |
| 29 |
+ * Revision 1.175 2005/02/01 08:54:45 nigelhorne |
|
| 30 |
+ * X-Virus-Status work |
|
| 31 |
+ * |
|
| 29 | 32 |
* Revision 1.174 2005/01/30 15:16:30 nigelhorne |
| 30 | 33 |
* Enable SESSION by default |
| 31 | 34 |
* |
| ... | ... |
@@ -533,9 +536,9 @@ |
| 533 | 533 |
* Revision 1.6 2003/09/28 16:37:23 nigelhorne |
| 534 | 534 |
* Added -f flag use MaxThreads if --max-children not set |
| 535 | 535 |
*/ |
| 536 |
-static char const rcsid[] = "$Id: clamav-milter.c,v 1.174 2005/01/30 15:16:30 nigelhorne Exp $"; |
|
| 536 |
+static char const rcsid[] = "$Id: clamav-milter.c,v 1.175 2005/02/01 08:54:45 nigelhorne Exp $"; |
|
| 537 | 537 |
|
| 538 |
-#define CM_VERSION "0.81e" |
|
| 538 |
+#define CM_VERSION "0.81f" |
|
| 539 | 539 |
|
| 540 | 540 |
#if HAVE_CONFIG_H |
| 541 | 541 |
#include "clamav-config.h" |
| ... | ... |
@@ -716,7 +719,6 @@ struct privdata {
|
| 716 | 716 |
u_char *body; /* body of the message if Sflag is set */ |
| 717 | 717 |
size_t bodyLen; /* number of bytes in body */ |
| 718 | 718 |
header_list_t headers; /* Message headers */ |
| 719 |
- int statusCount; /* number of X-Virus-Status headers */ |
|
| 720 | 719 |
long numBytes; /* Number of bytes sent so far */ |
| 721 | 720 |
char *received; /* keep track of received from */ |
| 722 | 721 |
const char *rejectCode; /* 550 or 554? */ |
| ... | ... |
@@ -725,6 +727,7 @@ struct privdata {
|
| 725 | 725 |
* looks like the remote end is playing ping |
| 726 | 726 |
* pong with us |
| 727 | 727 |
*/ |
| 728 |
+ int statusCount; /* number of X-Virus-Status headers */ |
|
| 728 | 729 |
int serverNumber; /* Index into serverIPs */ |
| 729 | 730 |
}; |
| 730 | 731 |
|
| ... | ... |
@@ -2669,28 +2672,16 @@ clamfi_header(SMFICTX *ctx, char *headerf, char *headerv) |
| 2669 | 2669 |
privdata->received = strdup(headerv); |
| 2670 | 2670 |
} |
| 2671 | 2671 |
|
| 2672 |
- if(strcasecmp(headerf, "X-Virus-Status") == 0) |
|
| 2673 |
- if(!nflag) { /* remove any existing claims */
|
|
| 2674 |
- if(smfi_chgheader(ctx, "X-Virus-Status", ++privdata->statusCount, NULL) == MI_FAILURE) |
|
| 2675 |
- /* |
|
| 2676 |
- * FIXME: It would be useful to know *why* it |
|
| 2677 |
- * had failed to be deleted |
|
| 2678 |
- */ |
|
| 2679 |
- if(use_syslog) |
|
| 2680 |
- syslog(LOG_ERR, _("Failed to delete X-Virus-Status header %d"), privdata->statusCount);
|
|
| 2681 |
- return SMFIS_CONTINUE; |
|
| 2682 |
- } |
|
| 2683 |
- |
|
| 2684 | 2672 |
if((strcasecmp(headerf, "Message-ID") == 0) && |
| 2685 | 2673 |
(strncasecmp(headerv, "<MDAEMON", 8) == 0)) |
| 2686 | 2674 |
privdata->discard = 1; |
| 2687 |
- |
|
| 2688 |
- if(strcasecmp(headerf, "Subject") == 0) {
|
|
| 2675 |
+ else if(strcasecmp(headerf, "Subject") == 0) {
|
|
| 2689 | 2676 |
if(privdata->subject) |
| 2690 | 2677 |
free(privdata->subject); |
| 2691 | 2678 |
if(headerv) |
| 2692 | 2679 |
privdata->subject = strdup(headerv); |
| 2693 |
- } |
|
| 2680 |
+ } else if(strcasecmp(headerf, "X-Virus-Status") == 0) |
|
| 2681 |
+ privdata->statusCount++; |
|
| 2694 | 2682 |
return SMFIS_CONTINUE; |
| 2695 | 2683 |
} |
| 2696 | 2684 |
|
| ... | ... |
@@ -2839,6 +2830,15 @@ clamfi_eom(SMFICTX *ctx) |
| 2839 | 2839 |
|
| 2840 | 2840 |
cli_dbgmsg("clamfi_eom\n");
|
| 2841 | 2841 |
|
| 2842 |
+ if(!nflag) { /* remove any existing claims that it's virus free */
|
|
| 2843 |
+ int i; |
|
| 2844 |
+ |
|
| 2845 |
+ for(i = 1; i <= privdata->statusCount; i++) |
|
| 2846 |
+ if(smfi_chgheader(ctx, "X-Virus-Status", i, NULL) == MI_FAILURE) |
|
| 2847 |
+ if(use_syslog) |
|
| 2848 |
+ syslog(LOG_WARNING, _("Failed to delete X-Virus-Status header %d"), i);
|
|
| 2849 |
+ } |
|
| 2850 |
+ |
|
| 2842 | 2851 |
#ifdef CL_DEBUG |
| 2843 | 2852 |
assert(privdata != NULL); |
| 2844 | 2853 |
#ifndef SESSION |
| ... | ... |
@@ -3091,8 +3091,12 @@ clamfi_eom(SMFICTX *ctx) |
| 3091 | 3091 |
else |
| 3092 | 3092 |
virusname = mess; |
| 3093 | 3093 |
|
| 3094 |
- if(!nflag) |
|
| 3095 |
- smfi_addheader(ctx, "X-Virus-Status", _("Infected"));
|
|
| 3094 |
+ if(!nflag) {
|
|
| 3095 |
+ char buf[129]; |
|
| 3096 |
+ |
|
| 3097 |
+ snprintf(buf, sizeof(buf) - 1, "%s %s", _("Infected with"), virusname);
|
|
| 3098 |
+ smfi_addheader(ctx, "X-Virus-Status", buf); |
|
| 3099 |
+ } |
|
| 3096 | 3100 |
|
| 3097 | 3101 |
if(use_syslog) {
|
| 3098 | 3102 |
/* |
| ... | ... |
@@ -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-01-28 08:47+0000\n" |
|
| 11 |
+"POT-Creation-Date: 2005-02-01 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,635 +16,635 @@ msgstr "" |
| 16 | 16 |
"Content-Type: text/plain; charset=CHARSET\n" |
| 17 | 17 |
"Content-Transfer-Encoding: 8bit\n" |
| 18 | 18 |
|
| 19 |
-#: clamav-milter.c:952 |
|
| 19 |
+#: clamav-milter.c:958 |
|
| 20 | 20 |
msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them." |
| 21 | 21 |
msgstr "" |
| 22 | 22 |
|
| 23 |
-#: clamav-milter.c:953 |
|
| 23 |
+#: clamav-milter.c:959 |
|
| 24 | 24 |
msgid "\t--bounce\t\t-b\tSend a failure message to the sender." |
| 25 | 25 |
msgstr "" |
| 26 | 26 |
|
| 27 |
-#: clamav-milter.c:954 |
|
| 27 |
+#: clamav-milter.c:960 |
|
| 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:955 |
|
| 33 |
+#: clamav-milter.c:961 |
|
| 34 | 34 |
msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE." |
| 35 | 35 |
msgstr "" |
| 36 | 36 |
|
| 37 |
-#: clamav-milter.c:956 |
|
| 37 |
+#: clamav-milter.c:962 |
|
| 38 | 38 |
msgid "\t--debug\t\t\t-D\tPrint debug messages." |
| 39 | 39 |
msgstr "" |
| 40 | 40 |
|
| 41 |
-#: clamav-milter.c:957 |
|
| 41 |
+#: clamav-milter.c:963 |
|
| 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:958 |
|
| 46 |
+#: clamav-milter.c:964 |
|
| 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:959 |
|
| 52 |
+#: clamav-milter.c:965 |
|
| 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:960 |
|
| 56 |
+#: clamav-milter.c:966 |
|
| 57 | 57 |
msgid "\t--external\t\t-e\tUse an external scanner (usually clamd)." |
| 58 | 58 |
msgstr "" |
| 59 | 59 |
|
| 60 |
-#: clamav-milter.c:961 |
|
| 60 |
+#: clamav-milter.c:967 |
|
| 61 | 61 |
msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here." |
| 62 | 62 |
msgstr "" |
| 63 | 63 |
|
| 64 |
-#: clamav-milter.c:962 |
|
| 64 |
+#: clamav-milter.c:968 |
|
| 65 | 65 |
msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)." |
| 66 | 66 |
msgstr "" |
| 67 | 67 |
|
| 68 |
-#: clamav-milter.c:963 |
|
| 68 |
+#: clamav-milter.c:969 |
|
| 69 | 69 |
msgid "\t--help\t\t\t-h\tThis message." |
| 70 | 70 |
msgstr "" |
| 71 | 71 |
|
| 72 |
-#: clamav-milter.c:964 |
|
| 72 |
+#: clamav-milter.c:970 |
|
| 73 | 73 |
msgid "\t--headers\t\t-H\tInclude original message headers in the report." |
| 74 | 74 |
msgstr "" |
| 75 | 75 |
|
| 76 |
-#: clamav-milter.c:965 |
|
| 76 |
+#: clamav-milter.c:971 |
|
| 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:966 |
|
| 80 |
+#: clamav-milter.c:972 |
|
| 81 | 81 |
msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans." |
| 82 | 82 |
msgstr "" |
| 83 | 83 |
|
| 84 |
-#: clamav-milter.c:967 |
|
| 84 |
+#: clamav-milter.c:973 |
|
| 85 | 85 |
msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine." |
| 86 | 86 |
msgstr "" |
| 87 | 87 |
|
| 88 |
-#: clamav-milter.c:968 |
|
| 88 |
+#: clamav-milter.c:974 |
|
| 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:969 |
|
| 92 |
+#: clamav-milter.c:975 |
|
| 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:970 |
|
| 96 |
+#: clamav-milter.c:976 |
|
| 97 | 97 |
msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile." |
| 98 | 98 |
msgstr "" |
| 99 | 99 |
|
| 100 |
-#: clamav-milter.c:971 |
|
| 100 |
+#: clamav-milter.c:977 |
|
| 101 | 101 |
msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]." |
| 102 | 102 |
msgstr "" |
| 103 | 103 |
|
| 104 |
-#: clamav-milter.c:972 |
|
| 104 |
+#: clamav-milter.c:978 |
|
| 105 | 105 |
msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster." |
| 106 | 106 |
msgstr "" |
| 107 | 107 |
|
| 108 |
-#: clamav-milter.c:973 |
|
| 108 |
+#: clamav-milter.c:979 |
|
| 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:974 |
|
| 112 |
+#: clamav-milter.c:980 |
|
| 113 | 113 |
msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account." |
| 114 | 114 |
msgstr "" |
| 115 | 115 |
|
| 116 |
-#: clamav-milter.c:975 |
|
| 116 |
+#: clamav-milter.c:981 |
|
| 117 | 117 |
msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails." |
| 118 | 118 |
msgstr "" |
| 119 | 119 |
|
| 120 |
-#: clamav-milter.c:976 |
|
| 120 |
+#: clamav-milter.c:982 |
|
| 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:977 |
|
| 126 |
+#: clamav-milter.c:983 |
|
| 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:978 |
|
| 130 |
+#: clamav-milter.c:984 |
|
| 131 | 131 |
msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file." |
| 132 | 132 |
msgstr "" |
| 133 | 133 |
|
| 134 |
-#: clamav-milter.c:979 |
|
| 134 |
+#: clamav-milter.c:985 |
|
| 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:980 |
|
| 138 |
+#: clamav-milter.c:986 |
|
| 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:981 |
|
| 142 |
+#: clamav-milter.c:987 |
|
| 143 | 143 |
msgid "\t--version\t\t-V\tPrint the version number of this software." |
| 144 | 144 |
msgstr "" |
| 145 | 145 |
|
| 146 |
-#: clamav-milter.c:983 |
|
| 146 |
+#: clamav-milter.c:989 |
|
| 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:985 |
|
| 150 |
+#: clamav-milter.c:991 |
|
| 151 | 151 |
msgid "" |
| 152 | 152 |
"\n" |
| 153 | 153 |
"For more information type \"man clamav-milter\"." |
| 154 | 154 |
msgstr "" |
| 155 | 155 |
|
| 156 |
-#: clamav-milter.c:986 |
|
| 156 |
+#: clamav-milter.c:992 |
|
| 157 | 157 |
msgid "Report bugs to bugs@clamav.net." |
| 158 | 158 |
msgstr "" |
| 159 | 159 |
|
| 160 |
-#: clamav-milter.c:1281 |
|
| 160 |
+#: clamav-milter.c:1287 |
|
| 161 | 161 |
#, c-format |
| 162 | 162 |
msgid "%s: No socket-addr given\n" |
| 163 | 163 |
msgstr "" |
| 164 | 164 |
|
| 165 |
-#: clamav-milter.c:1287 |
|
| 165 |
+#: clamav-milter.c:1293 |
|
| 166 | 166 |
#, c-format |
| 167 | 167 |
msgid "%s: socket-addr (%s) doesn't agree with sendmail.cf\n" |
| 168 | 168 |
msgstr "" |
| 169 | 169 |
|
| 170 |
-#: clamav-milter.c:1295 |
|
| 170 |
+#: clamav-milter.c:1301 |
|
| 171 | 171 |
#, c-format |
| 172 | 172 |
msgid "%s: Can't parse the config file %s\n" |
| 173 | 173 |
msgstr "" |
| 174 | 174 |
|
| 175 |
-#: clamav-milter.c:1334 |
|
| 175 |
+#: clamav-milter.c:1340 |
|
| 176 | 176 |
#, c-format |
| 177 | 177 |
msgid "" |
| 178 | 178 |
"%s: The iface option to --broadcast is not supported on your operating " |
| 179 | 179 |
"system\n" |
| 180 | 180 |
msgstr "" |
| 181 | 181 |
|
| 182 |
-#: clamav-milter.c:1343 |
|
| 182 |
+#: clamav-milter.c:1349 |
|
| 183 | 183 |
#, c-format |
| 184 | 184 |
msgid "%s: Can't get information about user %s\n" |
| 185 | 185 |
msgstr "" |
| 186 | 186 |
|
| 187 |
-#: clamav-milter.c:1354 |
|
| 187 |
+#: clamav-milter.c:1360 |
|
| 188 | 188 |
#, c-format |
| 189 | 189 |
msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n" |
| 190 | 190 |
msgstr "" |
| 191 | 191 |
|
| 192 |
-#: clamav-milter.c:1371 |
|
| 192 |
+#: clamav-milter.c:1377 |
|
| 193 | 193 |
#, c-format |
| 194 | 194 |
msgid "Running as user %s (UID %d, GID %d)\n" |
| 195 | 195 |
msgstr "" |
| 196 | 196 |
|
| 197 |
-#: clamav-milter.c:1374 |
|
| 197 |
+#: clamav-milter.c:1380 |
|
| 198 | 198 |
#, c-format |
| 199 | 199 |
msgid "%s: running as root is not recommended (check \"User\" in clamd.conf)\n" |
| 200 | 200 |
msgstr "" |
| 201 | 201 |
|
| 202 |
-#: clamav-milter.c:1376 |
|
| 202 |
+#: clamav-milter.c:1382 |
|
| 203 | 203 |
#, c-format |
| 204 | 204 |
msgid "%s: Only root can set an interface for --broadcast\n" |
| 205 | 205 |
msgstr "" |
| 206 | 206 |
|
| 207 |
-#: clamav-milter.c:1381 |
|
| 207 |
+#: clamav-milter.c:1387 |
|
| 208 | 208 |
#, c-format |
| 209 | 209 |
msgid "%s: Advisory mode doesn't work with quarantine mode\n" |
| 210 | 210 |
msgstr "" |
| 211 | 211 |
|
| 212 |
-#: clamav-milter.c:1389 |
|
| 212 |
+#: clamav-milter.c:1395 |
|
| 213 | 213 |
#, c-format |
| 214 | 214 |
msgid "%s: Advisory mode doesn't work with quarantine directories\n" |
| 215 | 215 |
msgstr "" |
| 216 | 216 |
|
| 217 |
-#: clamav-milter.c:1395 |
|
| 217 |
+#: clamav-milter.c:1401 |
|
| 218 | 218 |
#, c-format |
| 219 | 219 |
msgid "%s: the quarantine directory must not contain the string 'ERROR'\n" |
| 220 | 220 |
msgstr "" |
| 221 | 221 |
|
| 222 |
-#: clamav-milter.c:1401 |
|
| 222 |
+#: clamav-milter.c:1407 |
|
| 223 | 223 |
#, c-format |
| 224 | 224 |
msgid "%s: the quarantine directory must not contain the string 'FOUND'\n" |
| 225 | 225 |
msgstr "" |
| 226 | 226 |
|
| 227 |
-#: clamav-milter.c:1407 |
|
| 227 |
+#: clamav-milter.c:1413 |
|
| 228 | 228 |
#, c-format |
| 229 | 229 |
msgid "%s: the quarantine directory must not contain the string 'OK'\n" |
| 230 | 230 |
msgstr "" |
| 231 | 231 |
|
| 232 |
-#: clamav-milter.c:1424 |
|
| 232 |
+#: clamav-milter.c:1430 |
|
| 233 | 233 |
#, c-format |
| 234 | 234 |
msgid "%s: insecure quarantine directory %s (mode 0%o)\n" |
| 235 | 235 |
msgstr "" |
| 236 | 236 |
|
| 237 |
-#: clamav-milter.c:1450 |
|
| 237 |
+#: clamav-milter.c:1456 |
|
| 238 | 238 |
#, c-format |
| 239 | 239 |
msgid "%s: ReadTimeout must not be negative in %s\n" |
| 240 | 240 |
msgstr "" |
| 241 | 241 |
|
| 242 |
-#: clamav-milter.c:1458 |
|
| 242 |
+#: clamav-milter.c:1464 |
|
| 243 | 243 |
#, c-format |
| 244 | 244 |
msgid "%s: StreamMaxLength must not be negative in %s\n" |
| 245 | 245 |
msgstr "" |
| 246 | 246 |
|
| 247 |
-#: clamav-milter.c:1481 |
|
| 247 |
+#: clamav-milter.c:1487 |
|
| 248 | 248 |
#, c-format |
| 249 | 249 |
msgid "" |
| 250 | 250 |
"%s: (-q && !LogSyslog): warning - all interception message methods are off\n" |
| 251 | 251 |
msgstr "" |
| 252 | 252 |
|
| 253 |
-#: clamav-milter.c:1491 |
|
| 253 |
+#: clamav-milter.c:1497 |
|
| 254 | 254 |
#, c-format |
| 255 | 255 |
msgid "%s: --max-children must be given if --external is not given\n" |
| 256 | 256 |
msgstr "" |
| 257 | 257 |
|
| 258 |
-#: clamav-milter.c:1495 |
|
| 258 |
+#: clamav-milter.c:1501 |
|
| 259 | 259 |
#, c-format |
| 260 | 260 |
msgid "%s: --timeout must not be given if --external is not given\n" |
| 261 | 261 |
msgstr "" |
| 262 | 262 |
|
| 263 |
-#: clamav-milter.c:1508 |
|
| 263 |
+#: clamav-milter.c:1514 |
|
| 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:1518 |
|
| 268 |
+#: clamav-milter.c:1524 |
|
| 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:1520 |
|
| 273 |
+#: clamav-milter.c:1526 |
|
| 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:1530 clamav-milter.c:1553 |
|
| 278 |
+#: clamav-milter.c:1536 clamav-milter.c:1559 |
|
| 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:1532 clamav-milter.c:1555 |
|
| 283 |
+#: clamav-milter.c:1538 clamav-milter.c:1561 |
|
| 284 | 284 |
#, c-format |
| 285 | 285 |
msgid "Check your entry for LocalSocket in %s\n" |
| 286 | 286 |
msgstr "" |
| 287 | 287 |
|
| 288 |
-#: clamav-milter.c:1566 |
|
| 288 |
+#: clamav-milter.c:1572 |
|
| 289 | 289 |
msgid "Can't create a clamd session" |
| 290 | 290 |
msgstr "" |
| 291 | 291 |
|
| 292 |
-#: clamav-milter.c:1583 |
|
| 292 |
+#: clamav-milter.c:1589 |
|
| 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:1598 |
|
| 298 |
+#: clamav-milter.c:1604 |
|
| 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:1617 clamav-milter.c:1700 |
|
| 303 |
+#: clamav-milter.c:1623 clamav-milter.c:1706 |
|
| 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:1640 |
|
| 308 |
+#: clamav-milter.c:1646 |
|
| 309 | 309 |
#, c-format |
| 310 | 310 |
msgid "%s: Unknown host %s\n" |
| 311 | 311 |
msgstr "" |
| 312 | 312 |
|
| 313 |
-#: clamav-milter.c:1652 |
|
| 313 |
+#: clamav-milter.c:1658 |
|
| 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:1669 |
|
| 318 |
+#: clamav-milter.c:1675 |
|
| 319 | 319 |
msgid "Can't find any active clamd servers\n" |
| 320 | 320 |
msgstr "" |
| 321 | 321 |
|
| 322 |
-#: clamav-milter.c:1670 clamav-milter.c:1676 |
|
| 322 |
+#: clamav-milter.c:1676 clamav-milter.c:1682 |
|
| 323 | 323 |
#, c-format |
| 324 | 324 |
msgid "Check your entry for TCPSocket in %s\n" |
| 325 | 325 |
msgstr "" |
| 326 | 326 |
|
| 327 |
-#: clamav-milter.c:1675 |
|
| 327 |
+#: clamav-milter.c:1681 |
|
| 328 | 328 |
msgid "Can't find any clamd servers\n" |
| 329 | 329 |
msgstr "" |
| 330 | 330 |
|
| 331 |
-#: clamav-milter.c:1682 |
|
| 331 |
+#: clamav-milter.c:1688 |
|
| 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:1743 |
|
| 336 |
+#: clamav-milter.c:1749 |
|
| 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:1744 |
|
| 341 |
+#: clamav-milter.c:1750 |
|
| 342 | 342 |
msgid "\tso that you can see all of the messages" |
| 343 | 343 |
msgstr "" |
| 344 | 344 |
|
| 345 |
-#: clamav-milter.c:1816 |
|
| 345 |
+#: clamav-milter.c:1822 |
|
| 346 | 346 |
#, c-format |
| 347 | 347 |
msgid "%s: ScanMail not defined in %s (needed without --external), enabling\n" |
| 348 | 348 |
msgstr "" |
| 349 | 349 |
|
| 350 |
-#: clamav-milter.c:1877 |
|
| 350 |
+#: clamav-milter.c:1883 |
|
| 351 | 351 |
msgid "Starting clamav-milter" |
| 352 | 352 |
msgstr "" |
| 353 | 353 |
|
| 354 |
-#: clamav-milter.c:1886 |
|
| 354 |
+#: clamav-milter.c:1892 |
|
| 355 | 355 |
#, c-format |
| 356 | 356 |
msgid "Can't save PID in file %s" |
| 357 | 357 |
msgstr "" |
| 358 | 358 |
|
| 359 |
-#: clamav-milter.c:1888 |
|
| 359 |
+#: clamav-milter.c:1894 |
|
| 360 | 360 |
#, c-format |
| 361 | 361 |
msgid "Can't save PID in file %s\n" |
| 362 | 362 |
msgstr "" |
| 363 | 363 |
|
| 364 |
-#: clamav-milter.c:1921 |
|
| 364 |
+#: clamav-milter.c:1927 |
|
| 365 | 365 |
#, c-format |
| 366 | 366 |
msgid "%s: smfi_setconn failed\n" |
| 367 | 367 |
msgstr "" |
| 368 | 368 |
|
| 369 |
-#: clamav-milter.c:1937 |
|
| 369 |
+#: clamav-milter.c:1943 |
|
| 370 | 370 |
#, c-format |
| 371 | 371 |
msgid "Starting %s" |
| 372 | 372 |
msgstr "" |
| 373 | 373 |
|
| 374 |
-#: clamav-milter.c:1940 |
|
| 374 |
+#: clamav-milter.c:1946 |
|
| 375 | 375 |
msgid "Debugging is on" |
| 376 | 376 |
msgstr "" |
| 377 | 377 |
|
| 378 |
-#: clamav-milter.c:2005 clamav-milter.c:2262 |
|
| 378 |
+#: clamav-milter.c:2011 clamav-milter.c:2268 |
|
| 379 | 379 |
#, c-format |
| 380 | 380 |
msgid "Check clamd server %s - it may be down\n" |
| 381 | 381 |
msgstr "" |
| 382 | 382 |
|
| 383 |
-#: clamav-milter.c:2010 |
|
| 383 |
+#: clamav-milter.c:2016 |
|
| 384 | 384 |
msgid "Check clamd server - it may be down" |
| 385 | 385 |
msgstr "" |
| 386 | 386 |
|
| 387 |
-#: clamav-milter.c:2185 |
|
| 387 |
+#: clamav-milter.c:2191 |
|
| 388 | 388 |
msgid "No free clamd sessions\n" |
| 389 | 389 |
msgstr "" |
| 390 | 390 |
|
| 391 |
-#: clamav-milter.c:2265 |
|
| 391 |
+#: clamav-milter.c:2271 |
|
| 392 | 392 |
#, c-format |
| 393 | 393 |
msgid "Check clamd server %s - it may be down" |
| 394 | 394 |
msgstr "" |
| 395 | 395 |
|
| 396 |
-#: clamav-milter.c:2271 |
|
| 396 |
+#: clamav-milter.c:2277 |
|
| 397 | 397 |
msgid "Check clamd server - it may be down\n" |
| 398 | 398 |
msgstr "" |
| 399 | 399 |
|
| 400 |
-#: clamav-milter.c:2307 |
|
| 400 |
+#: clamav-milter.c:2313 |
|
| 401 | 401 |
msgid "findServer: select failed" |
| 402 | 402 |
msgstr "" |
| 403 | 403 |
|
| 404 |
-#: clamav-milter.c:2316 |
|
| 404 |
+#: clamav-milter.c:2322 |
|
| 405 | 405 |
#, c-format |
| 406 | 406 |
msgid "findServer: using server %d\n" |
| 407 | 407 |
msgstr "" |
| 408 | 408 |
|
| 409 |
-#: clamav-milter.c:2321 |
|
| 409 |
+#: clamav-milter.c:2327 |
|
| 410 | 410 |
msgid "findServer: No response from any server\n" |
| 411 | 411 |
msgstr "" |
| 412 | 412 |
|
| 413 |
-#: clamav-milter.c:2323 |
|
| 413 |
+#: clamav-milter.c:2329 |
|
| 414 | 414 |
msgid "findServer: No response from any server" |
| 415 | 415 |
msgstr "" |
| 416 | 416 |
|
| 417 |
-#: clamav-milter.c:2344 |
|
| 417 |
+#: clamav-milter.c:2350 |
|
| 418 | 418 |
msgid "clamfi_connect: ctx is null" |
| 419 | 419 |
msgstr "" |
| 420 | 420 |
|
| 421 |
-#: clamav-milter.c:2349 |
|
| 421 |
+#: clamav-milter.c:2355 |
|
| 422 | 422 |
msgid "clamfi_connect: hostname is null" |
| 423 | 423 |
msgstr "" |
| 424 | 424 |
|
| 425 |
-#: clamav-milter.c:2370 |
|
| 425 |
+#: clamav-milter.c:2376 |
|
| 426 | 426 |
msgid "clamfi_connect: remoteIP is null" |
| 427 | 427 |
msgstr "" |
| 428 | 428 |
|
| 429 |
-#: clamav-milter.c:2379 |
|
| 429 |
+#: clamav-milter.c:2385 |
|
| 430 | 430 |
#, c-format |
| 431 | 431 |
msgid "clamfi_connect: connection from %s" |
| 432 | 432 |
msgstr "" |
| 433 | 433 |
|
| 434 |
-#: clamav-milter.c:2380 |
|
| 434 |
+#: clamav-milter.c:2386 |
|
| 435 | 435 |
#, c-format |
| 436 | 436 |
msgid "clamfi_connect: connection from %s\n" |
| 437 | 437 |
msgstr "" |
| 438 | 438 |
|
| 439 |
-#: clamav-milter.c:2383 |
|
| 439 |
+#: clamav-milter.c:2389 |
|
| 440 | 440 |
#, c-format |
| 441 | 441 |
msgid "clamfi_connect: connection from %s [%s]" |
| 442 | 442 |
msgstr "" |
| 443 | 443 |
|
| 444 |
-#: clamav-milter.c:2384 |
|
| 444 |
+#: clamav-milter.c:2390 |
|
| 445 | 445 |
#, c-format |
| 446 | 446 |
msgid "clamfi_connect: connection from %s [%s]\n" |
| 447 | 447 |
msgstr "" |
| 448 | 448 |
|
| 449 |
-#: clamav-milter.c:2404 |
|
| 449 |
+#: clamav-milter.c:2410 |
|
| 450 | 450 |
msgid "Can't get sendmail hostname" |
| 451 | 451 |
msgstr "" |
| 452 | 452 |
|
| 453 |
-#: clamav-milter.c:2413 |
|
| 453 |
+#: clamav-milter.c:2419 |
|
| 454 | 454 |
#, c-format |
| 455 | 455 |
msgid "Access Denied: Host Unknown (%s)" |
| 456 | 456 |
msgstr "" |
| 457 | 457 |
|
| 458 |
-#: clamav-milter.c:2422 |
|
| 458 |
+#: clamav-milter.c:2428 |
|
| 459 | 459 |
#, c-format |
| 460 | 460 |
msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n" |
| 461 | 461 |
msgstr "" |
| 462 | 462 |
|
| 463 |
-#: clamav-milter.c:2433 |
|
| 463 |
+#: clamav-milter.c:2439 |
|
| 464 | 464 |
#, c-format |
| 465 | 465 |
msgid "Access Denied: Can't get IP address for (%s)" |
| 466 | 466 |
msgstr "" |
| 467 | 467 |
|
| 468 |
-#: clamav-milter.c:2450 |
|
| 468 |
+#: clamav-milter.c:2456 |
|
| 469 | 469 |
#, c-format |
| 470 | 470 |
msgid "Access Denied for %s[%s]" |
| 471 | 471 |
msgstr "" |
| 472 | 472 |
|
| 473 |
-#: clamav-milter.c:2468 |
|
| 473 |
+#: clamav-milter.c:2474 |
|
| 474 | 474 |
msgid "clamfi_connect: not scanning outgoing messages" |
| 475 | 475 |
msgstr "" |
| 476 | 476 |
|
| 477 |
-#: clamav-milter.c:2469 |
|
| 477 |
+#: clamav-milter.c:2475 |
|
| 478 | 478 |
msgid "clamfi_connect: not scanning outgoing messages\n" |
| 479 | 479 |
msgstr "" |
| 480 | 480 |
|
| 481 |
-#: clamav-milter.c:2477 |
|
| 481 |
+#: clamav-milter.c:2483 |
|
| 482 | 482 |
msgid "clamfi_connect: not scanning local messages" |
| 483 | 483 |
msgstr "" |
| 484 | 484 |
|
| 485 |
-#: clamav-milter.c:2478 |
|
| 485 |
+#: clamav-milter.c:2484 |
|
| 486 | 486 |
msgid "clamfi_connect: not scanning local messages\n" |
| 487 | 487 |
msgstr "" |
| 488 | 488 |
|
| 489 |
-#: clamav-milter.c:2510 |
|
| 489 |
+#: clamav-milter.c:2516 |
|
| 490 | 490 |
#, c-format |
| 491 | 491 |
msgid "hit max-children limit (%u >= %u)\n" |
| 492 | 492 |
msgstr "" |
| 493 | 493 |
|
| 494 |
-#: clamav-milter.c:2511 |
|
| 494 |
+#: clamav-milter.c:2517 |
|
| 495 | 495 |
#, c-format |
| 496 | 496 |
msgid "hit max-children limit (%u >= %u): waiting for some to exit\n" |
| 497 | 497 |
msgstr "" |
| 498 | 498 |
|
| 499 |
-#: clamav-milter.c:2517 |
|
| 499 |
+#: clamav-milter.c:2523 |
|
| 500 | 500 |
#, c-format |
| 501 | 501 |
msgid "hit max-children limit (%u >= %u)" |
| 502 | 502 |
msgstr "" |
| 503 | 503 |
|
| 504 |
-#: clamav-milter.c:2518 |
|
| 504 |
+#: clamav-milter.c:2524 |
|
| 505 | 505 |
#, c-format |
| 506 | 506 |
msgid "hit max-children limit (%u >= %u): waiting for some to exit" |
| 507 | 507 |
msgstr "" |
| 508 | 508 |
|
| 509 |
-#: clamav-milter.c:2523 |
|
| 509 |
+#: clamav-milter.c:2529 |
|
| 510 | 510 |
msgid "AV system temporarily overloaded - please try later" |
| 511 | 511 |
msgstr "" |
| 512 | 512 |
|
| 513 |
-#: clamav-milter.c:2556 |
|
| 513 |
+#: clamav-milter.c:2562 |
|
| 514 | 514 |
#, c-format |
| 515 | 515 |
msgid ">n_children = %d\n" |
| 516 | 516 |
msgstr "" |
| 517 | 517 |
|
| 518 |
-#: clamav-milter.c:2562 |
|
| 518 |
+#: clamav-milter.c:2568 |
|
| 519 | 519 |
msgid "Timeout waiting for a child to die" |
| 520 | 520 |
msgstr "" |
| 521 | 521 |
|
| 522 |
-#: clamav-milter.c:2564 |
|
| 522 |
+#: clamav-milter.c:2570 |
|
| 523 | 523 |
msgid "Timeout waiting for a child to die\n" |
| 524 | 524 |
msgstr "" |
| 525 | 525 |
|
| 526 |
-#: clamav-milter.c:2674 |
|
| 527 |
-#, c-format |
|
| 528 |
-msgid "Failed to delete X-Virus-Status header %d" |
|
| 529 |
-msgstr "" |
|
| 530 |
- |
|
| 531 |
-#: clamav-milter.c:2702 |
|
| 526 |
+#: clamav-milter.c:2696 |
|
| 532 | 527 |
msgid "clamfi_eoh" |
| 533 | 528 |
msgstr "" |
| 534 | 529 |
|
| 535 |
-#: clamav-milter.c:2705 |
|
| 530 |
+#: clamav-milter.c:2699 |
|
| 536 | 531 |
msgid "clamfi_eoh\n" |
| 537 | 532 |
msgstr "" |
| 538 | 533 |
|
| 539 |
-#: clamav-milter.c:2762 |
|
| 534 |
+#: clamav-milter.c:2756 |
|
| 540 | 535 |
msgid "clamfi_eoh: ignoring whitelisted message" |
| 541 | 536 |
msgstr "" |
| 542 | 537 |
|
| 543 |
-#: clamav-milter.c:2764 |
|
| 538 |
+#: clamav-milter.c:2758 |
|
| 544 | 539 |
msgid "clamfi_eoh: ignoring whitelisted message\n" |
| 545 | 540 |
msgstr "" |
| 546 | 541 |
|
| 547 |
-#: clamav-milter.c:2778 |
|
| 542 |
+#: clamav-milter.c:2772 |
|
| 548 | 543 |
#, c-format |
| 549 | 544 |
msgid "clamfi_envbody: %u bytes" |
| 550 | 545 |
msgstr "" |
| 551 | 546 |
|
| 552 |
-#: clamav-milter.c:2780 |
|
| 547 |
+#: clamav-milter.c:2774 |
|
| 553 | 548 |
#, c-format |
| 554 | 549 |
msgid "clamfi_envbody: %u bytes\n" |
| 555 | 550 |
msgstr "" |
| 556 | 551 |
|
| 557 |
-#: clamav-milter.c:2790 clamav-milter.c:3054 |
|
| 552 |
+#: clamav-milter.c:2784 clamav-milter.c:3057 |
|
| 558 | 553 |
#, c-format |
| 559 | 554 |
msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned" |
| 560 | 555 |
msgstr "" |
| 561 | 556 |
|
| 562 |
-#: clamav-milter.c:2794 clamav-milter.c:3057 |
|
| 557 |
+#: clamav-milter.c:2788 clamav-milter.c:3060 |
|
| 563 | 558 |
msgid "Not Scanned - StreamMaxLength exceeded" |
| 564 | 559 |
msgstr "" |
| 565 | 560 |
|
| 566 |
-#: clamav-milter.c:2894 |
|
| 561 |
+#: clamav-milter.c:2836 |
|
| 562 |
+#, c-format |
|
| 563 |
+msgid "Failed to delete X-Virus-Status header %d" |
|
| 564 |
+msgstr "" |
|
| 565 |
+ |
|
| 566 |
+#: clamav-milter.c:2897 |
|
| 567 | 567 |
#, c-format |
| 568 | 568 |
msgid "failed to send SCAN %s command to clamd" |
| 569 | 569 |
msgstr "" |
| 570 | 570 |
|
| 571 |
-#: clamav-milter.c:2916 |
|
| 571 |
+#: clamav-milter.c:2919 |
|
| 572 | 572 |
msgid "failed to send SCAN command to clamd" |
| 573 | 573 |
msgstr "" |
| 574 | 574 |
|
| 575 |
-#: clamav-milter.c:2932 |
|
| 575 |
+#: clamav-milter.c:2935 |
|
| 576 | 576 |
#, c-format |
| 577 | 577 |
msgid "Wating to read status from fd %d\n" |
| 578 | 578 |
msgstr "" |
| 579 | 579 |
|
| 580 |
-#: clamav-milter.c:2943 |
|
| 580 |
+#: clamav-milter.c:2946 |
|
| 581 | 581 |
#, c-format |
| 582 | 582 |
msgid "clamfi_eom: read %s" |
| 583 | 583 |
msgstr "" |
| 584 | 584 |
|
| 585 |
-#: clamav-milter.c:2944 |
|
| 585 |
+#: clamav-milter.c:2947 |
|
| 586 | 586 |
#, c-format |
| 587 | 587 |
msgid "clamfi_eom: read %s\n" |
| 588 | 588 |
msgstr "" |
| 589 | 589 |
|
| 590 |
-#: clamav-milter.c:2952 |
|
| 590 |
+#: clamav-milter.c:2955 |
|
| 591 | 591 |
msgid "clamfi_eom: read nothing from clamd" |
| 592 | 592 |
msgstr "" |
| 593 | 593 |
|
| 594 |
-#: clamav-milter.c:2954 |
|
| 594 |
+#: clamav-milter.c:2957 |
|
| 595 | 595 |
msgid "clamfi_eom: read nothing from clamd\n" |
| 596 | 596 |
msgstr "" |
| 597 | 597 |
|
| 598 |
-#: clamav-milter.c:2999 clamav-milter.c:3043 |
|
| 598 |
+#: clamav-milter.c:3002 clamav-milter.c:3046 |
|
| 599 | 599 |
msgid "Error determining host" |
| 600 | 600 |
msgstr "" |
| 601 | 601 |
|
| 602 |
-#: clamav-milter.c:3062 |
|
| 602 |
+#: clamav-milter.c:3065 |
|
| 603 | 603 |
msgid "Not Scanned" |
| 604 | 604 |
msgstr "" |
| 605 | 605 |
|
| 606 |
-#: clamav-milter.c:3089 |
|
| 607 |
-msgid "Infected" |
|
| 606 |
+#: clamav-milter.c:3094 |
|
| 607 |
+msgid "Infected with" |
|
| 608 | 608 |
msgstr "" |
| 609 | 609 |
|
| 610 |
-#: clamav-milter.c:3108 |
|
| 610 |
+#: clamav-milter.c:3115 |
|
| 611 | 611 |
#, c-format |
| 612 | 612 |
msgid "Intercepted virus from %s to" |
| 613 | 613 |
msgstr "" |
| 614 | 614 |
|
| 615 |
-#: clamav-milter.c:3208 |
|
| 615 |
+#: clamav-milter.c:3215 |
|
| 616 | 616 |
msgid "" |
| 617 | 617 |
"Subject: Virus intercepted\n" |
| 618 | 618 |
"\n" |
| 619 | 619 |
msgstr "" |
| 620 | 620 |
|
| 621 |
-#: clamav-milter.c:3230 |
|
| 621 |
+#: clamav-milter.c:3237 |
|
| 622 | 622 |
msgid "A message you sent to\n" |
| 623 | 623 |
msgstr "" |
| 624 | 624 |
|
| 625 |
-#: clamav-milter.c:3237 |
|
| 625 |
+#: clamav-milter.c:3244 |
|
| 626 | 626 |
#, c-format |
| 627 | 627 |
msgid "The message %1$s sent from %2$s to\n" |
| 628 | 628 |
msgstr "" |
| 629 | 629 |
|
| 630 |
-#: clamav-milter.c:3240 |
|
| 630 |
+#: clamav-milter.c:3247 |
|
| 631 | 631 |
#, c-format |
| 632 | 632 |
msgid "A message sent from %s to\n" |
| 633 | 633 |
msgstr "" |
| 634 | 634 |
|
| 635 |
-#: clamav-milter.c:3245 |
|
| 635 |
+#: clamav-milter.c:3252 |
|
| 636 | 636 |
#, c-format |
| 637 | 637 |
msgid "contained %s and has not been delivered.\n" |
| 638 | 638 |
msgstr "" |
| 639 | 639 |
|
| 640 |
-#: clamav-milter.c:3248 |
|
| 640 |
+#: clamav-milter.c:3255 |
|
| 641 | 641 |
#, c-format |
| 642 | 642 |
msgid "" |
| 643 | 643 |
"\n" |
| 644 | 644 |
"The message in question has been quarantined as %s\n" |
| 645 | 645 |
msgstr "" |
| 646 | 646 |
|
| 647 |
-#: clamav-milter.c:3251 |
|
| 647 |
+#: clamav-milter.c:3258 |
|
| 648 | 648 |
#, c-format |
| 649 | 649 |
msgid "" |
| 650 | 650 |
"\n" |
| ... | ... |
@@ -652,13 +652,13 @@ msgid "" |
| 652 | 652 |
"\n" |
| 653 | 653 |
msgstr "" |
| 654 | 654 |
|
| 655 |
-#: clamav-milter.c:3254 |
|
| 655 |
+#: clamav-milter.c:3261 |
|
| 656 | 656 |
msgid "" |
| 657 | 657 |
"For your information, the original message headers were:\n" |
| 658 | 658 |
"\n" |
| 659 | 659 |
msgstr "" |
| 660 | 660 |
|
| 661 |
-#: clamav-milter.c:3267 |
|
| 661 |
+#: clamav-milter.c:3274 |
|
| 662 | 662 |
#, c-format |
| 663 | 663 |
msgid "" |
| 664 | 664 |
"\n" |
| ... | ... |
@@ -666,234 +666,234 @@ msgid "" |
| 666 | 666 |
"%s\t\n" |
| 667 | 667 |
msgstr "" |
| 668 | 668 |
|
| 669 |
-#: clamav-milter.c:3278 |
|
| 669 |
+#: clamav-milter.c:3285 |
|
| 670 | 670 |
#, c-format |
| 671 | 671 |
msgid "Quarantined infected mail as %s" |
| 672 | 672 |
msgstr "" |
| 673 | 673 |
|
| 674 |
-#: clamav-milter.c:3302 |
|
| 674 |
+#: clamav-milter.c:3309 |
|
| 675 | 675 |
#, c-format |
| 676 | 676 |
msgid "Can't set quarantine user %s" |
| 677 | 677 |
msgstr "" |
| 678 | 678 |
|
| 679 |
-#: clamav-milter.c:3304 |
|
| 679 |
+#: clamav-milter.c:3311 |
|
| 680 | 680 |
#, c-format |
| 681 | 681 |
msgid "Can't set quarantine user %s\n" |
| 682 | 682 |
msgstr "" |
| 683 | 683 |
|
| 684 |
-#: clamav-milter.c:3329 |
|
| 684 |
+#: clamav-milter.c:3336 |
|
| 685 | 685 |
#, c-format |
| 686 | 686 |
msgid "virus %s detected by ClamAV - http://www.clamav.net" |
| 687 | 687 |
msgstr "" |
| 688 | 688 |
|
| 689 |
-#: clamav-milter.c:3334 |
|
| 689 |
+#: clamav-milter.c:3341 |
|
| 690 | 690 |
msgid "Unknown" |
| 691 | 691 |
msgstr "" |
| 692 | 692 |
|
| 693 |
-#: clamav-milter.c:3336 |
|
| 693 |
+#: clamav-milter.c:3343 |
|
| 694 | 694 |
#, c-format |
| 695 | 695 |
msgid "%s: incorrect message \"%s\" from clamd" |
| 696 | 696 |
msgstr "" |
| 697 | 697 |
|
| 698 |
-#: clamav-milter.c:3342 |
|
| 698 |
+#: clamav-milter.c:3349 |
|
| 699 | 699 |
msgid "Clean" |
| 700 | 700 |
msgstr "" |
| 701 | 701 |
|
| 702 |
-#: clamav-milter.c:3346 |
|
| 702 |
+#: clamav-milter.c:3353 |
|
| 703 | 703 |
#, c-format |
| 704 | 704 |
msgid "%s: clean message from %s" |
| 705 | 705 |
msgstr "" |
| 706 | 706 |
|
| 707 |
-#: clamav-milter.c:3348 |
|
| 707 |
+#: clamav-milter.c:3355 |
|
| 708 | 708 |
msgid "an unknown sender" |
| 709 | 709 |
msgstr "" |
| 710 | 710 |
|
| 711 |
-#: clamav-milter.c:3452 |
|
| 711 |
+#: clamav-milter.c:3459 |
|
| 712 | 712 |
#, c-format |
| 713 | 713 |
msgid "Can't remove clean file %s" |
| 714 | 714 |
msgstr "" |
| 715 | 715 |
|
| 716 |
-#: clamav-milter.c:3633 clamav-milter.c:3636 |
|
| 716 |
+#: clamav-milter.c:3640 clamav-milter.c:3643 |
|
| 717 | 717 |
#, c-format |
| 718 | 718 |
msgid "write failure (%u bytes) to %s: %s" |
| 719 | 719 |
msgstr "" |
| 720 | 720 |
|
| 721 |
-#: clamav-milter.c:3650 clamav-milter.c:3653 |
|
| 721 |
+#: clamav-milter.c:3657 clamav-milter.c:3660 |
|
| 722 | 722 |
#, c-format |
| 723 | 723 |
msgid "write failure (%u bytes) to clamd: %s" |
| 724 | 724 |
msgstr "" |
| 725 | 725 |
|
| 726 |
-#: clamav-milter.c:3719 |
|
| 726 |
+#: clamav-milter.c:3726 |
|
| 727 | 727 |
#, c-format |
| 728 | 728 |
msgid "No data received from clamd in %d seconds\n" |
| 729 | 729 |
msgstr "" |
| 730 | 730 |
|
| 731 |
-#: clamav-milter.c:3741 |
|
| 731 |
+#: clamav-milter.c:3748 |
|
| 732 | 732 |
#, c-format |
| 733 | 733 |
msgid "Can't stat %s" |
| 734 | 734 |
msgstr "" |
| 735 | 735 |
|
| 736 |
-#: clamav-milter.c:3752 clamav-milter.c:4175 |
|
| 736 |
+#: clamav-milter.c:3759 clamav-milter.c:4182 |
|
| 737 | 737 |
#, c-format |
| 738 | 738 |
msgid "Can't open %s" |
| 739 | 739 |
msgstr "" |
| 740 | 740 |
|
| 741 |
-#: clamav-milter.c:3868 clamav-milter.c:4340 |
|
| 741 |
+#: clamav-milter.c:3875 clamav-milter.c:4347 |
|
| 742 | 742 |
#, c-format |
| 743 | 743 |
msgid "mkdir %s failed" |
| 744 | 744 |
msgstr "" |
| 745 | 745 |
|
| 746 |
-#: clamav-milter.c:3880 |
|
| 746 |
+#: clamav-milter.c:3887 |
|
| 747 | 747 |
#, c-format |
| 748 | 748 |
msgid "mktemp %s failed" |
| 749 | 749 |
msgstr "" |
| 750 | 750 |
|
| 751 |
-#: clamav-milter.c:3890 |
|
| 751 |
+#: clamav-milter.c:3897 |
|
| 752 | 752 |
#, c-format |
| 753 | 753 |
msgid "Temporary quarantine file %s creation failed" |
| 754 | 754 |
msgstr "" |
| 755 | 755 |
|
| 756 |
-#: clamav-milter.c:3994 |
|
| 756 |
+#: clamav-milter.c:4001 |
|
| 757 | 757 |
#, c-format |
| 758 | 758 |
msgid "failed to send STREAM command clamd server %d" |
| 759 | 759 |
msgstr "" |
| 760 | 760 |
|
| 761 |
-#: clamav-milter.c:4003 |
|
| 761 |
+#: clamav-milter.c:4010 |
|
| 762 | 762 |
msgid "failed to send STREAM command clamd" |
| 763 | 763 |
msgstr "" |
| 764 | 764 |
|
| 765 |
-#: clamav-milter.c:4015 |
|
| 765 |
+#: clamav-milter.c:4022 |
|
| 766 | 766 |
msgid "failed to create TCPSocket to talk to clamd" |
| 767 | 767 |
msgstr "" |
| 768 | 768 |
|
| 769 |
-#: clamav-milter.c:4027 clamav-milter.c:4043 |
|
| 769 |
+#: clamav-milter.c:4034 clamav-milter.c:4050 |
|
| 770 | 770 |
msgid "recv failed from clamd getting PORT" |
| 771 | 771 |
msgstr "" |
| 772 | 772 |
|
| 773 |
-#: clamav-milter.c:4031 clamav-milter.c:4045 |
|
| 773 |
+#: clamav-milter.c:4038 clamav-milter.c:4052 |
|
| 774 | 774 |
msgid "EOF from clamd getting PORT" |
| 775 | 775 |
msgstr "" |
| 776 | 776 |
|
| 777 |
-#: clamav-milter.c:4056 |
|
| 777 |
+#: clamav-milter.c:4063 |
|
| 778 | 778 |
#, c-format |
| 779 | 779 |
msgid "Expected port information from clamd, got '%s'" |
| 780 | 780 |
msgstr "" |
| 781 | 781 |
|
| 782 |
-#: clamav-milter.c:4059 |
|
| 782 |
+#: clamav-milter.c:4066 |
|
| 783 | 783 |
#, c-format |
| 784 | 784 |
msgid "Expected port information from clamd, got '%s'\n" |
| 785 | 785 |
msgstr "" |
| 786 | 786 |
|
| 787 |
-#: clamav-milter.c:4079 clamav-milter.c:4082 |
|
| 787 |
+#: clamav-milter.c:4086 clamav-milter.c:4089 |
|
| 788 | 788 |
#, c-format |
| 789 | 789 |
msgid "Connecting to local port %d - data %d cmd %d\n" |
| 790 | 790 |
msgstr "" |
| 791 | 791 |
|
| 792 |
-#: clamav-milter.c:4097 clamav-milter.c:4100 |
|
| 792 |
+#: clamav-milter.c:4104 clamav-milter.c:4107 |
|
| 793 | 793 |
#, c-format |
| 794 | 794 |
msgid "Failed to connect to port %d given by clamd: %s" |
| 795 | 795 |
msgstr "" |
| 796 | 796 |
|
| 797 |
-#: clamav-milter.c:4187 |
|
| 797 |
+#: clamav-milter.c:4194 |
|
| 798 | 798 |
#, c-format |
| 799 | 799 |
msgid "Clamd (pid %d) seems to have died" |
| 800 | 800 |
msgstr "" |
| 801 | 801 |
|
| 802 |
-#: clamav-milter.c:4213 |
|
| 802 |
+#: clamav-milter.c:4220 |
|
| 803 | 803 |
#, c-format |
| 804 | 804 |
msgid "Can't open e-mail template file %s" |
| 805 | 805 |
msgstr "" |
| 806 | 806 |
|
| 807 |
-#: clamav-milter.c:4222 |
|
| 807 |
+#: clamav-milter.c:4229 |
|
| 808 | 808 |
#, c-format |
| 809 | 809 |
msgid "Can't stat e-mail template file %s" |
| 810 | 810 |
msgstr "" |
| 811 | 811 |
|
| 812 |
-#: clamav-milter.c:4231 |
|
| 812 |
+#: clamav-milter.c:4238 |
|
| 813 | 813 |
msgid "Out of memory" |
| 814 | 814 |
msgstr "" |
| 815 | 815 |
|
| 816 |
-#: clamav-milter.c:4258 |
|
| 816 |
+#: clamav-milter.c:4265 |
|
| 817 | 817 |
#, c-format |
| 818 | 818 |
msgid "%s: Unknown clamAV variable \"%c\"\n" |
| 819 | 819 |
msgstr "" |
| 820 | 820 |
|
| 821 |
-#: clamav-milter.c:4269 |
|
| 821 |
+#: clamav-milter.c:4276 |
|
| 822 | 822 |
#, c-format |
| 823 | 823 |
msgid "%s: Unterminated sendmail variable \"%s\"\n" |
| 824 | 824 |
msgstr "" |
| 825 | 825 |
|
| 826 |
-#: clamav-milter.c:4280 |
|
| 826 |
+#: clamav-milter.c:4287 |
|
| 827 | 827 |
#, c-format |
| 828 | 828 |
msgid "%s: Unknown sendmail variable \"%s\"\n" |
| 829 | 829 |
msgstr "" |
| 830 | 830 |
|
| 831 |
-#: clamav-milter.c:4367 |
|
| 831 |
+#: clamav-milter.c:4374 |
|
| 832 | 832 |
#, c-format |
| 833 | 833 |
msgid "Can't rename %1$s to %2$s" |
| 834 | 834 |
msgstr "" |
| 835 | 835 |
|
| 836 |
-#: clamav-milter.c:4376 |
|
| 836 |
+#: clamav-milter.c:4383 |
|
| 837 | 837 |
#, c-format |
| 838 | 838 |
msgid "File quarantined as %s" |
| 839 | 839 |
msgstr "" |
| 840 | 840 |
|
| 841 |
-#: clamav-milter.c:4468 |
|
| 841 |
+#: clamav-milter.c:4475 |
|
| 842 | 842 |
#, c-format |
| 843 | 843 |
msgid "[Virus] %s" |
| 844 | 844 |
msgstr "" |
| 845 | 845 |
|
| 846 |
-#: clamav-milter.c:4562 |
|
| 846 |
+#: clamav-milter.c:4569 |
|
| 847 | 847 |
msgid "" |
| 848 | 848 |
"No response from any clamd server - your AV system is not scanning emails\n" |
| 849 | 849 |
msgstr "" |
| 850 | 850 |
|
| 851 |
-#: clamav-milter.c:4565 |
|
| 851 |
+#: clamav-milter.c:4572 |
|
| 852 | 852 |
msgid "" |
| 853 | 853 |
"No response from any clamd server - your AV system is not scanning emails" |
| 854 | 854 |
msgstr "" |
| 855 | 855 |
|
| 856 |
-#: clamav-milter.c:4583 |
|
| 856 |
+#: clamav-milter.c:4590 |
|
| 857 | 857 |
msgid "Subject: ClamAV Down\n" |
| 858 | 858 |
msgstr "" |
| 859 | 859 |
|
| 860 |
-#: clamav-milter.c:4586 |
|
| 860 |
+#: clamav-milter.c:4593 |
|
| 861 | 861 |
msgid "" |
| 862 | 862 |
"This is an automatic message\n" |
| 863 | 863 |
"\n" |
| 864 | 864 |
msgstr "" |
| 865 | 865 |
|
| 866 |
-#: clamav-milter.c:4589 |
|
| 866 |
+#: clamav-milter.c:4596 |
|
| 867 | 867 |
msgid "The clamd program cannot be contacted.\n" |
| 868 | 868 |
msgstr "" |
| 869 | 869 |
|
| 870 |
-#: clamav-milter.c:4591 |
|
| 870 |
+#: clamav-milter.c:4598 |
|
| 871 | 871 |
msgid "No clamd server can be contacted.\n" |
| 872 | 872 |
msgstr "" |
| 873 | 873 |
|
| 874 |
-#: clamav-milter.c:4593 |
|
| 874 |
+#: clamav-milter.c:4600 |
|
| 875 | 875 |
msgid "Emails may not be being scanned, please check your servers.\n" |
| 876 | 876 |
msgstr "" |
| 877 | 877 |
|
| 878 |
-#: clamav-milter.c:4662 |
|
| 878 |
+#: clamav-milter.c:4669 |
|
| 879 | 879 |
msgid "Loading new database" |
| 880 | 880 |
msgstr "" |
| 881 | 881 |
|
| 882 |
-#: clamav-milter.c:4850 |
|
| 882 |
+#: clamav-milter.c:4857 |
|
| 883 | 883 |
#, c-format |
| 884 | 884 |
msgid "Stopping %s" |
| 885 | 885 |
msgstr "" |
| 886 | 886 |
|
| 887 |
-#: clamav-milter.c:4894 |
|
| 887 |
+#: clamav-milter.c:4901 |
|
| 888 | 888 |
msgid "Stopping clamav-milter" |
| 889 | 889 |
msgstr "" |
| 890 | 890 |
|
| 891 |
-#: clamav-milter.c:5002 |
|
| 891 |
+#: clamav-milter.c:5009 |
|
| 892 | 892 |
#, c-format |
| 893 | 893 |
msgid "ClamAV: Protecting against %u viruses" |
| 894 | 894 |
msgstr "" |
| 895 | 895 |
|
| 896 |
-#: clamav-milter.c:5007 |
|
| 896 |
+#: clamav-milter.c:5014 |
|
| 897 | 897 |
#, c-format |
| 898 | 898 |
msgid "Loaded %s" |
| 899 | 899 |
msgstr "" |