@@ -1,3 +1,7 @@

+Fri Dec  3 17:36:08 GMT 2004 (njh)

+----------------------------------

+  * clamav-milter:	internal: Honour scanning modes and archive limits

+

 Fri Dec  3 03:32:17 CET 2004 (tk)

 ---------------------------------

   * libclamav: attempt to rebuild PE structure from UPX compressed files

@@ -574,6 +574,7 @@ Changes

 0.80v	2/12/04: --internal now notices when freshclam has been run

 		The default value for --timeout has been changed from 60

 			seconds to 0 (wait forever)

+0.80w	3/12/04: --internal now honours scanning modes and archive limits

 INTERNATIONALISATION

@@ -26,6 +26,9 @@

  *

  * Change History:

  * $Log: clamav-milter.c,v $

+ * Revision 1.157  2004/12/03 17:34:58  nigelhorne

+ * internal: Honour scanning modes and archive limits

+ *

  * Revision 1.156  2004/12/02 11:09:05  nigelhorne

  * --internal now reloads the database

  *

@@ -479,9 +482,9 @@

  * Revision 1.6  2003/09/28 16:37:23  nigelhorne

  * Added -f flag use MaxThreads if --max-children not set

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.156 2004/12/02 11:09:05 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.157 2004/12/03 17:34:58 nigelhorne Exp $";

-#define	CM_VERSION	"0.80v"

+#define	CM_VERSION	"0.80w"

 /*#define	CONFDIR	"/usr/local/etc"*/

@@ -717,6 +720,7 @@ static	int	internal = 0;	/* scan messages ourself or use clamd? */

 static	struct	cl_node	*root = NULL;

 static	struct	cl_limits	limits;

 static	struct	cl_stat	dbstat;

+static	int	options = CL_SCAN_STDOPT;

 static	int	bflag = 0;	/*

 				 * send a failure (bounce) message to the

@@ -910,7 +914,7 @@ main(int argc, char **argv)

 	extern char *optarg;

 	int i, Bflag = 0;

 	const char *cfgfile = CL_DEFAULT_CFG;

-	struct cfgstruct *cpt;

+	const struct cfgstruct *cpt;

 	const char *pidfile = NULL;

 	char version[VERSION_LENGTH + 1];

 #ifdef	SESSION

@@ -1245,7 +1249,7 @@ main(int argc, char **argv)

 			return EX_CONFIG;

 #endif

 		}

-		

+

 		if((cpt = cfgopt(copt, "User")) != NULL) {

 			const struct passwd *user;

@@ -1342,7 +1346,7 @@ main(int argc, char **argv)

 			return EX_CONFIG;

 		}

 	}

-	

+

 	if((cpt = cfgopt(copt, "StreamMaxLength")) != NULL) {

 		if(cpt->numarg < 0) {

 			fprintf(stderr, _("%s: StreamMaxLength must not be negative in %s\n"),

@@ -1377,6 +1381,11 @@ main(int argc, char **argv)

 	 * we're doing the scanning internally

 	 */

 	if(internal) {

+		if(!cfgopt(copt, "ScanMail")) {

+			fprintf(stderr, _("%s: ScanMail not defined in %s\n"),

+				argv[0], cfgfile);

+			return EX_CONFIG;

+		}

 		if(max_children == 0) {

 			fprintf(stderr, _("%s: --max-children must be given in internal mode\n"), argv[0]);

 			return EX_CONFIG;

@@ -1658,6 +1667,60 @@ main(int argc, char **argv)

 	atexit(quit);

+	if(internal) {

+		/* TODO: read the limits from clamd.conf */

+

+		if(cfgopt(copt, "DisableDefaultScanOptions"))

+			options &= ~CL_SCAN_STDOPT;

+		options |= CL_SCAN_MAIL;	/* no choice */

+		if(!cfgopt(copt, "ScanRAR"))

+			options |= CL_SCAN_DISABLERAR;

+		if(cfgopt(copt, "ArchiveBlockEncrypted"))

+			options |= CL_SCAN_BLOCKENCRYPTED;

+		if(cfgopt(copt, "ArchiveBlockMax"))

+			options |= CL_SCAN_BLOCKMAX;

+		if(cfgopt(copt, "ScanPE"))

+			options |= CL_SCAN_PE;

+		if(cfgopt(copt, "DetectBrokenExecutables"))

+			options |= CL_SCAN_BLOCKBROKEN;

+		if(cfgopt(copt, "MailFollowURLs"))

+			options |= CL_SCAN_MAILURL;

+		if(cfgopt(copt, "ScanOLE2"))

+			options |= CL_SCAN_OLE2;

+		if(cfgopt(copt, "ScanHTML"))

+			options |= CL_SCAN_HTML;

+

+		memset(&limits, '\0', sizeof(struct cl_limits));

+

+		if(cfgopt(copt, "ScanArchive")) {

+			options |= CL_SCAN_ARCHIVE;

+			if((cpt = cfgopt(copt, "ArchiveMaxFileSize")) != NULL)

+				limits.maxfilesize = cpt->numarg;

+			else

+				limits.maxfilesize = 10485760;

+

+			if((cpt = cfgopt(copt, "ArchiveMaxRecursion")) != NULL)

+				limits.maxreclevel = cpt->numarg;

+			else

+				limits.maxreclevel = 8;

+

+			if((cpt = cfgopt(copt, "ArchiveMaxFiles")) != NULL)

+				limits.maxfiles = cpt->numarg;

+			else

+				limits.maxfiles = 1000;

+

+			if((cpt = cfgopt(copt, "ArchiveMaxCompressionRatio")) != NULL)

+				limits.maxratio = cpt->numarg;

+			else

+				limits.maxratio = 250;

+

+			if(cfgopt(copt, "ArchiveLimitMemoryUsage") != NULL)

+				limits.archivememlim = 1;

+			else

+				limits.archivememlim = 0;

+		}

+	}

+

 #ifdef	SESSION

 	/* FIXME: add localSocket support to watchdog */

 	if(localSocket == NULL)

@@ -2593,12 +2656,11 @@ clamfi_eom(SMFICTX *ctx)

 		unsigned long int scanned = 0L;

 		/*

-		 * TODO: read the options from clamd.conf

 		 * TODO: consider using cl_scandesc and not using a temporary

 		 *	file from the mail being read in

 		 */

 		rc = cl_scanfile(privdata->filename, &virname, &scanned, root,

-			&limits, CL_SCAN_STDOPT);

+			&limits, options);

 		if(rc == CL_CLEAN)

 			strcpy(mess, "OK");

@@ -2631,7 +2693,7 @@ clamfi_eom(SMFICTX *ctx)

 			perror("send");

 			clamfi_cleanup(ctx);

 			if(use_syslog)

-				syslog(LOG_ERR, _("send failed to clamd"));

+				syslog(LOG_ERR, _("failed to send SCAN %s command to clamd"), privdata->filename);

 			return cl_error;

 		}

 #else

@@ -2653,7 +2715,7 @@ clamfi_eom(SMFICTX *ctx)

 			perror("send");

 			clamfi_cleanup(ctx);

 			if(use_syslog)

-				syslog(LOG_ERR, _("send failed to clamd"));

+				syslog(LOG_ERR, _("failed to send SCAN command to clamd"));

 			return cl_error;

 		}

@@ -3715,14 +3777,14 @@ connect2clamd(struct privdata *privdata)

 			cli_warnmsg("Failed sending stream to server %d (fd %d) errno %d\n",

 				freeServer, session->sock, errno);

 			if(use_syslog)

-				syslog(LOG_ERR, _("send failed to clamd"));

+				syslog(LOG_ERR, _("failed to send STREAM command clamd"));

 			return 0;

 		}

 #else

 		if(send(privdata->cmdSocket, "STREAM\n", 7, 0) < 7) {

 			perror("send");

 			if(use_syslog)

-				syslog(LOG_ERR, _("send failed to clamd"));

+				syslog(LOG_ERR, _("failed to send STREAM command clamd"));

 			return 0;

 		}

 		shutdown(privdata->cmdSocket, SHUT_WR);

@@ -4531,10 +4593,6 @@ loadDatabase(void)

 	firsttime = (dbdir == NULL);

 	if(firsttime) {

-		/*

-		 * TODO: Set limits

-		 */

-

 		if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory")))

 			dbdir = cpt->strarg;

 		else

@@ -8,7 +8,7 @@ msgid ""

 msgstr ""

 "Project-Id-Version: PACKAGE VERSION\n"

 "Report-Msgid-Bugs-To: bugs@clamav.net\n"

-"POT-Creation-Date: 2004-12-02 11:07+0000\n"

+"POT-Creation-Date: 2004-12-03 17:34+0000\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -16,587 +16,596 @@ msgstr ""

 "Content-Type: text/plain; charset=CHARSET\n"

 "Content-Transfer-Encoding: 8bit\n"

-#: clamav-milter.c:867

+#: clamav-milter.c:871

 msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them."

 msgstr ""

-#: clamav-milter.c:868

+#: clamav-milter.c:872

 msgid "\t--bounce\t\t-b\tSend a failure message to the sender."

 msgstr ""

-#: clamav-milter.c:869

+#: clamav-milter.c:873

 msgid ""

 "\t--broadcast\t\t-B [IFACE]\tBroadcast to a network manager when a virus is "

 "found."

 msgstr ""

-#: clamav-milter.c:870

+#: clamav-milter.c:874

 msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE."

 msgstr ""

-#: clamav-milter.c:871

+#: clamav-milter.c:875

 msgid "\t--debug\t\t\t-D\tPrint debug messages."

 msgstr ""

-#: clamav-milter.c:872

+#: clamav-milter.c:876

 msgid ""

 "\t--dont-log-clean\t-C\tDon't add an entry to syslog that a mail is clean."

 msgstr ""

-#: clamav-milter.c:873

+#: clamav-milter.c:877

 msgid ""

 "\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error "

 "occurs."

 msgstr ""

-#: clamav-milter.c:874

+#: clamav-milter.c:878

 msgid "\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded."

 msgstr ""

-#: clamav-milter.c:875

+#: clamav-milter.c:879

 msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."

 msgstr ""

-#: clamav-milter.c:876

+#: clamav-milter.c:880

 msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)."

 msgstr ""

-#: clamav-milter.c:877

+#: clamav-milter.c:881

 msgid "\t--help\t\t\t-h\tThis message."

 msgstr ""

-#: clamav-milter.c:878

+#: clamav-milter.c:882

 msgid "\t--headers\t\t-H\tInclude original message headers in the report."

 msgstr ""

-#: clamav-milter.c:879

+#: clamav-milter.c:883

 msgid "\t--internal\t\t-I\tUse the internal scanner."

 msgstr ""

-#: clamav-milter.c:880

+#: clamav-milter.c:884

 msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN."

 msgstr ""

-#: clamav-milter.c:881

+#: clamav-milter.c:885

 msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans."

 msgstr ""

-#: clamav-milter.c:882

+#: clamav-milter.c:886

 msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine."

 msgstr ""

-#: clamav-milter.c:883

+#: clamav-milter.c:887

 msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."

 msgstr ""

-#: clamav-milter.c:884

+#: clamav-milter.c:888

 msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."

 msgstr ""

-#: clamav-milter.c:885

+#: clamav-milter.c:889

 msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."

 msgstr ""

-#: clamav-milter.c:886

+#: clamav-milter.c:890

 msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."

 msgstr ""

-#: clamav-milter.c:887

+#: clamav-milter.c:891

 msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster."

 msgstr ""

-#: clamav-milter.c:888

+#: clamav-milter.c:892

 msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."

 msgstr ""

-#: clamav-milter.c:889

+#: clamav-milter.c:893

 msgid "\t--quarantine=USER\t-Q EMAIL\tQuanrantine e-mail account."

 msgstr ""

-#: clamav-milter.c:890

+#: clamav-milter.c:894

 msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."

 msgstr ""

-#: clamav-milter.c:891

+#: clamav-milter.c:895

 msgid ""

 "\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running "

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:892

+#: clamav-milter.c:896

 msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."

 msgstr ""

-#: clamav-milter.c:893

+#: clamav-milter.c:897

 msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file."

 msgstr ""

-#: clamav-milter.c:894

+#: clamav-milter.c:898

 msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."

 msgstr ""

-#: clamav-milter.c:895

+#: clamav-milter.c:899

 msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die."

 msgstr ""

-#: clamav-milter.c:896

+#: clamav-milter.c:900

 msgid "\t--version\t\t-V\tPrint the version number of this software."

 msgstr ""

-#: clamav-milter.c:898

+#: clamav-milter.c:902

 msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'."

 msgstr ""

-#: clamav-milter.c:900

+#: clamav-milter.c:904

 msgid ""

 "\n"

 "For more information type \"man clamav-milter\"."

 msgstr ""

-#: clamav-milter.c:901

+#: clamav-milter.c:905

 msgid "Report bugs to bugs@clamav.net."

 msgstr ""

-#: clamav-milter.c:1193

+#: clamav-milter.c:1197

 #, c-format

 msgid "%s: No socket-addr given\n"

 msgstr ""

-#: clamav-milter.c:1202

+#: clamav-milter.c:1206

 #, c-format

 msgid "%s: Can't parse the config file %s\n"

 msgstr ""

-#: clamav-milter.c:1241

+#: clamav-milter.c:1245

 #, c-format

 msgid ""

 "%s: The iface option to --broadcast is not supported on your operating "

 "system\n"

 msgstr ""

-#: clamav-milter.c:1250

+#: clamav-milter.c:1254

 #, c-format

 msgid "%s: Can't get information about user %s\n"

 msgstr ""

-#: clamav-milter.c:1261

+#: clamav-milter.c:1265

 #, c-format

 msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n"

 msgstr ""

-#: clamav-milter.c:1278

+#: clamav-milter.c:1282

 #, c-format

 msgid "Running as user %s (UID %d, GID %d)\n"

 msgstr ""

-#: clamav-milter.c:1281

+#: clamav-milter.c:1285

 #, c-format

 msgid "%s: running as root is not recommended (check \"User\" in clamd.conf)\n"

 msgstr ""

-#: clamav-milter.c:1283

+#: clamav-milter.c:1287

 #, c-format

 msgid "%s: Only root can set an interface for --broadcast\n"

 msgstr ""

-#: clamav-milter.c:1288

+#: clamav-milter.c:1292

 #, c-format

 msgid "%s: Advisory mode doesn't work with quarantine mode\n"

 msgstr ""

-#: clamav-milter.c:1295

+#: clamav-milter.c:1299

 #, c-format

 msgid "%s: Advisory mode doesn't work with quarantine directories\n"

 msgstr ""

-#: clamav-milter.c:1311

+#: clamav-milter.c:1315

 #, c-format

 msgid "%s: insecure quarantine directory %s (mode 0%o)\n"

 msgstr ""

-#: clamav-milter.c:1337

+#: clamav-milter.c:1341

 #, c-format

 msgid "%s: ReadTimeout must not be negative in %s\n"

 msgstr ""

-#: clamav-milter.c:1345

+#: clamav-milter.c:1349

 #, c-format

 msgid "%s: StreamMaxLength must not be negative in %s\n"

 msgstr ""

-#: clamav-milter.c:1368

+#: clamav-milter.c:1372

 #, c-format

 msgid ""

 "%s: (-q && !LogSyslog): warning - all interception message methods are off\n"

 msgstr ""

-#: clamav-milter.c:1378

+#: clamav-milter.c:1382

+#, c-format

+msgid "%s: ScanMail not defined in %s\n"

+msgstr ""

+

+#: clamav-milter.c:1387

 #, c-format

 msgid "%s: --max-children must be given in internal mode\n"

 msgstr ""

-#: clamav-milter.c:1382

+#: clamav-milter.c:1391

 #, c-format

 msgid "%s: --timeout must not be given in internal mode\n"

 msgstr ""

-#: clamav-milter.c:1394

+#: clamav-milter.c:1403

 #, c-format

 msgid "%s: You can select one server type only (local/TCP) in %s\n"

 msgstr ""

-#: clamav-milter.c:1404

+#: clamav-milter.c:1413

 #, c-format

 msgid "The connection from sendmail to %s (%s) must not\n"

 msgstr ""

-#: clamav-milter.c:1406

+#: clamav-milter.c:1415

 #, c-format

 msgid "be the same as the connection to clamd (%s) in %s\n"

 msgstr ""

-#: clamav-milter.c:1416 clamav-milter.c:1439

+#: clamav-milter.c:1425 clamav-milter.c:1448

 #, c-format

 msgid "Can't talk to clamd server via %s\n"

 msgstr ""

-#: clamav-milter.c:1418 clamav-milter.c:1441

+#: clamav-milter.c:1427 clamav-milter.c:1450

 #, c-format

 msgid "Check your entry for LocalSocket in %s\n"

 msgstr ""

-#: clamav-milter.c:1452

+#: clamav-milter.c:1461

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1469

+#: clamav-milter.c:1478

 #, c-format

 msgid ""

 "%s: --quarantine-dir not supported for remote scanning - use --quarantine\n"

 msgstr ""

-#: clamav-milter.c:1484

+#: clamav-milter.c:1493

 #, c-format

 msgid "%s: hostname %s is longer than %d characters\n"

 msgstr ""

-#: clamav-milter.c:1503

+#: clamav-milter.c:1512

 #, c-format

 msgid "%s: --max-children must be given in sessions mode\n"

 msgstr ""

-#: clamav-milter.c:1526

+#: clamav-milter.c:1535

 #, c-format

 msgid "%s: Unknown host %s\n"

 msgstr ""

-#: clamav-milter.c:1538

+#: clamav-milter.c:1547

 #, c-format

 msgid "Can't talk to clamd server %s on port %d\n"

 msgstr ""

-#: clamav-milter.c:1555

+#: clamav-milter.c:1564

 msgid "Can't find any active clamd servers\n"

 msgstr ""

-#: clamav-milter.c:1556 clamav-milter.c:1562

+#: clamav-milter.c:1565 clamav-milter.c:1571

 #, c-format

 msgid "Check your entry for TCPSocket in %s\n"

 msgstr ""

-#: clamav-milter.c:1561

+#: clamav-milter.c:1570

 msgid "Can't find any clamd servers\n"

 msgstr ""

-#: clamav-milter.c:1568

+#: clamav-milter.c:1577

 #, c-format

 msgid "%s: You must select server type (local/TCP) in %s\n"

 msgstr ""

-#: clamav-milter.c:1619

+#: clamav-milter.c:1628

 #, c-format

 msgid "When debugging it is recommended that you use Foreground mode in %s\n"

 msgstr ""

-#: clamav-milter.c:1620

+#: clamav-milter.c:1629

 msgid "\tso that you can see all of the messages"

 msgstr ""

-#: clamav-milter.c:1667

+#: clamav-milter.c:1730

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1676

+#: clamav-milter.c:1739

 #, c-format

 msgid "Can't save PID in file %s"

 msgstr ""

-#: clamav-milter.c:1678

+#: clamav-milter.c:1741

 #, c-format

 msgid "Can't save PID in file %s\n"

 msgstr ""

-#: clamav-milter.c:1706

+#: clamav-milter.c:1769

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1720

+#: clamav-milter.c:1783

 #, c-format

 msgid "Starting: %s"

 msgstr ""

-#: clamav-milter.c:1723

+#: clamav-milter.c:1786

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1777 clamav-milter.c:2021

+#: clamav-milter.c:1840 clamav-milter.c:2084

 #, c-format

 msgid "Check clamd server %s - it may be down\n"

 msgstr ""

-#: clamav-milter.c:1782 clamav-milter.c:2030

+#: clamav-milter.c:1845 clamav-milter.c:2093

 msgid "Check clamd server - it may be down\n"

 msgstr ""

-#: clamav-milter.c:1947

+#: clamav-milter.c:2010

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2024

+#: clamav-milter.c:2087

 #, c-format

 msgid "Check clamd server %s - it may be down"

 msgstr ""

-#: clamav-milter.c:2066

+#: clamav-milter.c:2129

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2075

+#: clamav-milter.c:2138

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2080

+#: clamav-milter.c:2143

 msgid "findServer: No response from any server\n"

 msgstr ""

-#: clamav-milter.c:2082

+#: clamav-milter.c:2145

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2103

+#: clamav-milter.c:2166

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2108

+#: clamav-milter.c:2171

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2129

+#: clamav-milter.c:2192

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2137

+#: clamav-milter.c:2200

 #, c-format

 msgid "clamfi_connect: connection from %s [%s]"

 msgstr ""

-#: clamav-milter.c:2138

+#: clamav-milter.c:2201

 #, c-format

 msgid "clamfi_connect: connection from %s [%s]\n"

 msgstr ""

-#: clamav-milter.c:2157

+#: clamav-milter.c:2220

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2162

+#: clamav-milter.c:2225

 #, c-format

 msgid "Access Denied: Host Unknown (%s)"

 msgstr ""

-#: clamav-milter.c:2172

+#: clamav-milter.c:2235

 #, c-format

 msgid "Access Denied: Can't get IP address for (%s)"

 msgstr ""

-#: clamav-milter.c:2189

+#: clamav-milter.c:2252

 #, c-format

 msgid "Access Denied for %s[%s]"

 msgstr ""

-#: clamav-milter.c:2207

+#: clamav-milter.c:2270

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2208

+#: clamav-milter.c:2271

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2216

+#: clamav-milter.c:2279

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2217

+#: clamav-milter.c:2280

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2251

+#: clamav-milter.c:2314

 #, c-format

 msgid "hit max-children limit (%u >= %u)\n"

 msgstr ""

-#: clamav-milter.c:2252

+#: clamav-milter.c:2315

 #, c-format

 msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"

 msgstr ""

-#: clamav-milter.c:2258

+#: clamav-milter.c:2321

 #, c-format

 msgid "hit max-children limit (%u >= %u)"

 msgstr ""

-#: clamav-milter.c:2259

+#: clamav-milter.c:2322

 #, c-format

 msgid "hit max-children limit (%u >= %u): waiting for some to exit"

 msgstr ""

-#: clamav-milter.c:2264

+#: clamav-milter.c:2327

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2294

+#: clamav-milter.c:2357

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2300

+#: clamav-milter.c:2363

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2302

+#: clamav-milter.c:2365

 msgid "Timeout waiting for a child to die\n"

 msgstr ""

-#: clamav-milter.c:2412

+#: clamav-milter.c:2475

 #, c-format

 msgid "Failed to delete X-Virus-Status header %d"

 msgstr ""

-#: clamav-milter.c:2440

+#: clamav-milter.c:2503

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2443

+#: clamav-milter.c:2506

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2500

+#: clamav-milter.c:2563

 msgid "clamfi_eoh: ignoring whitelisted message"

 msgstr ""

-#: clamav-milter.c:2502

+#: clamav-milter.c:2565

 msgid "clamfi_eoh: ignoring whitelisted message\n"

 msgstr ""

-#: clamav-milter.c:2516

+#: clamav-milter.c:2579

 #, c-format

 msgid "clamfi_envbody: %u bytes"

 msgstr ""

-#: clamav-milter.c:2518

+#: clamav-milter.c:2581

 #, c-format

 msgid "clamfi_envbody: %u bytes\n"

 msgstr ""

-#: clamav-milter.c:2528 clamav-milter.c:2787

+#: clamav-milter.c:2591 clamav-milter.c:2849

 #, c-format

 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"

 msgstr ""

-#: clamav-milter.c:2532 clamav-milter.c:2790

+#: clamav-milter.c:2595 clamav-milter.c:2852

 msgid "Not Scanned - StreamMaxLength exceeded"

 msgstr ""

-#: clamav-milter.c:2631 clamav-milter.c:2653 clamav-milter.c:3715

-#: clamav-milter.c:3722

-msgid "send failed to clamd"

+#: clamav-milter.c:2693

+#, c-format

+msgid "failed to send SCAN %s command to clamd"

 msgstr ""

-#: clamav-milter.c:2669

+#: clamav-milter.c:2715

+msgid "failed to send SCAN command to clamd"

+msgstr ""

+

+#: clamav-milter.c:2731

 #, c-format

 msgid "Wating to read status from fd %d\n"

 msgstr ""

-#: clamav-milter.c:2680

+#: clamav-milter.c:2742

 #, c-format

 msgid "clamfi_eom: read %s"

 msgstr ""

-#: clamav-milter.c:2681

+#: clamav-milter.c:2743

 #, c-format

 msgid "clamfi_eom: read %s\n"

 msgstr ""

-#: clamav-milter.c:2689

+#: clamav-milter.c:2751

 msgid "clamfi_eom: read nothing from clamd"

 msgstr ""

-#: clamav-milter.c:2691

+#: clamav-milter.c:2753

 msgid "clamfi_eom: read nothing from clamd\n"

 msgstr ""

-#: clamav-milter.c:2736 clamav-milter.c:2776

+#: clamav-milter.c:2798 clamav-milter.c:2838

 msgid "Error determining host"

 msgstr ""

-#: clamav-milter.c:2795

+#: clamav-milter.c:2857