@@ -1,3 +1,14 @@

+Sun Oct 24 04:52:01 BST 2004 (njh)

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

+  * libclamav/message.c:	Change encoding guess message from warn to debug

+  * clamav-milter:		Validate the length of the server hostnames

+				Generate a more useful message than libmilter's

+					bind failure message when the two

+					sockets are the same named pipe

+				SESSION code now on by default

+				Use cli_strtokbuf() instead of cli_strtok()

+					whereever possible

+

 Fri Oct 22 18:20:03 BST 2004 (njh)

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

   * libclamav/message.c:	Handle broken messages which state

@@ -519,6 +519,12 @@ Changes

 		Improved tracing of the infected machine

 0.80j	8/10/04	SESSION: reset the session if the PORT command fails

 		Correct --broadcast code if BINDTODEVICE isn't supported

+0.80k	24/10/04 Validate the length of the server hostnames

+		Die if the name of the sockets are the same. By dying earlier

+			we can generate a more useful message than libmilter's

+			bind failure message

+		SESSION code now on by default

+		Use cli_strtokbuf() instead of cli_strtok() whereever possible

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.142  2004/10/24 03:49:47  nigelhorne

+ * Enable SESSION code by default

+ *

  * Revision 1.141  2004/10/09 22:10:08  nigelhorne

  * BINDTODEVICE fix was broken

  *

@@ -434,9 +437,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.141 2004/10/09 22:10:08 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.142 2004/10/24 03:49:47 nigelhorne Exp $";

-#define	CM_VERSION	"0.80j"

+#define	CM_VERSION	"0.80k"

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

@@ -482,6 +485,7 @@ static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.141 2004/10/09 22:10:08 ni

 #include <pwd.h>

 #include <grp.h>

 #include <netdb.h>

+#include <sys/param.h>

 #ifdef	C_LINUX

 #include <libintl.h>

@@ -525,16 +529,7 @@ typedef	unsigned short	in_port_t;

 typedef	unsigned int	in_addr_t;

 #endif

-/*

- * Do not define SESSION in a production environment - it has been known to put

- * clamd into a loop when clamav-milter is restarted and sending STREAM often

- * returns EPIPE

- *

- * It is however OK for testing: code is now in place to reopen as session

- * that has gone bad, and it would be useful to find out the set of

- * circumstances that causes clamd to loop

- */

-/*#define	SESSION	/*

+#define	SESSION	/*

 		 * Keep one command connection open to clamd, otherwise a new

 		 * command connection is created for each new email

 		 */

@@ -1273,12 +1268,25 @@ main(int argc, char **argv)

 #ifdef	SESSION

 		struct sockaddr_un server;

 #endif

+		char *sockname = NULL;

 		if(cfgopt(copt, "TCPSocket") != NULL) {

 			fprintf(stderr, _("%s: You can select one server type only (local/TCP) in %s\n"),

 				argv[0], cfgfile);

 			return EX_CONFIG;

 		}

+		if(strncasecmp(port, "unix:", 5) == 0)

+			sockname = &port[5];

+		else if(strncasecmp(port, "local:", 6) == 0)

+			sockname = &port[6];

+

+		if(sockname && (strcmp(sockname, cpt->strarg) == 0)) {

+		   	fprintf(stderr, _("The connection from sendmail to %s (%s) must not\n"),

+				argv[0], sockname);

+		   	fprintf(stderr, _("be the same as the connection to clamd (%s) in %s\n"),

+				cpt->strarg, cfgfile);

+			return EX_CONFIG;

+		}

 		/*

 		 * TODO: check --server hasn't been set

 		 */

@@ -1325,6 +1333,10 @@ main(int argc, char **argv)

 			return EX_UNAVAILABLE;

 		}

 #endif

+		/*

+		 * FIXME: Allow connection to remote servers by TCP/IP whilst

+		 * connecting to the localserver via a UNIX domain socket

+		 */

 		numServers = 1;

 	} else if((cpt = cfgopt(copt, "TCPSocket")) != NULL) {

 		int activeServers;

@@ -1346,6 +1358,13 @@ main(int argc, char **argv)

 			char *hostname = cli_strtok(serverHostNames, numServers, ":");

 			if(hostname == NULL)

 				break;

+#ifdef	MAXHOSTNAMELEN

+			if(strlen(hostname) > MAXHOSTNAMELEN) {

+				fprintf(stderr, _("%s: hostname %s is longer than %d characters\n"),

+					argv[0], hostname, MAXHOSTNAMELEN);

+				return EX_CONFIG;

+			}

+#endif

 			numServers++;

 			free(hostname);

 		}

@@ -1366,7 +1385,14 @@ main(int argc, char **argv)

 #endif

 		for(i = 0; i < numServers; i++) {

+#ifdef	MAXHOSTNAMELEN

+			char hostname[MAXHOSTNAMELEN + 1];

+

+			if(cli_strtokbuf(serverHostNames, i, ":", hostname) == NULL)

+				break;

+#else

 			char *hostname = cli_strtok(serverHostNames, i, ":");

+#endif

 			/*

 			 * Translate server's name to IP address

@@ -1392,7 +1418,10 @@ main(int argc, char **argv)

 					hostname, tcpSocket);

 			}

 #endif

+

+#ifndef	MAXHOSTNAMELEN

 			free(hostname);

+#endif

 		}

 #ifdef	SESSION

 		activeServers = numServers;

@@ -1580,9 +1609,18 @@ createSession(int session)

 	}

 	if(ret != 0) {

+#ifdef	MAXHOSTNAMELEN

+		char hostname[MAXHOSTNAMELEN + 1];

+

+		cli_strtokbuf(serverHostNames, serverNumber, ":", hostname);

+#else

 		char *hostname = cli_strtok(serverHostNames, serverNumber, ":");

+#endif

+

 		cli_warnmsg(_("Check clamd server %s - it may be down\n"), hostname);

+#ifndef	MAXHOSTNAMELEN

 		free(hostname);

+#endif

 		broadcast(_("Check clamd server - it may be down\n"));

@@ -1812,14 +1850,22 @@ findServer(void)

 		if((connect(sock, (struct sockaddr *)server, sizeof(struct sockaddr)) < 0) ||

 		   (send(sock, "PING\n", 5, 0) < 5)) {

+#ifdef	MAXHOSTNAMELEN

+			char hostname[MAXHOSTNAMELEN + 1];

+

+			cli_strtokbuf(serverHostNames, i, ":", hostname);

+#else

 			char *hostname = cli_strtok(serverHostNames, i, ":");

+#endif

 			cli_warnmsg(_("Check clamd server %s - it may be down\n"), hostname);

 			if(use_syslog)

 				syslog(LOG_WARNING,

 					_("Check clamd server %s - it may be down"),

 					hostname);

 			close(sock);

+#ifndef	MAXHOSTNAMELEN

 			free(hostname);

+#endif

 			broadcast(_("Check clamd server - it may be down\n"));

 			socks[i] = -1;

 			continue;

@@ -2471,13 +2517,21 @@ clamfi_eom(SMFICTX *ctx)

 			snprintf(buf, sizeof(buf) - 1, "%s\n\ton %s",

 				clamav_version, hostname);

 		} else {

-			char *hostname = cli_strtok(serverHostNames, privdata->serverNumber, ":");

+#ifdef	MAXHOSTNAMELEN

+			char hostname[MAXHOSTNAMELEN + 1];

+			if(cli_strtokbuf(serverHostNames, privdata->serverNumber, ":", hostname)) {

+#else

+			char *hostname = cli_strtok(serverHostNames, privdata->serverNumber, ":");

 			if(hostname) {

+#endif

+

 				snprintf(buf, sizeof(buf) - 1, "%s\n\ton %s",

 					clamav_version,

 					hostname);

+#ifndef	MAXHOSTNAMELEN

 				free(hostname);

+#endif

 			} else

 				/* sanity check failed - should issue warning */

 				strcpy(buf, _("Error determining host"));

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

 msgstr ""

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

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

-"POT-Creation-Date: 2004-10-07 16:36+0100\n"

+"POT-Creation-Date: 2004-10-24 04:42+0100\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,206 +16,206 @@ msgstr ""

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

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

-#: clamav-milter.c:795

+#: clamav-milter.c:793

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

 msgstr ""

-#: clamav-milter.c:796

+#: clamav-milter.c:794

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

 msgstr ""

-#: clamav-milter.c:797

+#: clamav-milter.c:795

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:798

+#: clamav-milter.c:796

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

 msgstr ""

-#: clamav-milter.c:799

+#: clamav-milter.c:797

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

 msgstr ""

-#: clamav-milter.c:800

+#: clamav-milter.c:798

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:801

+#: clamav-milter.c:799

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:802

+#: clamav-milter.c:800

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

 msgstr ""

-#: clamav-milter.c:803

+#: clamav-milter.c:801

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

 msgstr ""

-#: clamav-milter.c:804

+#: clamav-milter.c:802

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

 msgstr ""

-#: clamav-milter.c:805

+#: clamav-milter.c:803

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

 msgstr ""

-#: clamav-milter.c:806

+#: clamav-milter.c:804

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

 msgstr ""

-#: clamav-milter.c:807

+#: clamav-milter.c:805

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

 msgstr ""

-#: clamav-milter.c:808

+#: clamav-milter.c:806

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

 msgstr ""

-#: clamav-milter.c:809

+#: clamav-milter.c:807

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

 msgstr ""

-#: clamav-milter.c:810

+#: clamav-milter.c:808

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

 msgstr ""

-#: clamav-milter.c:811

+#: clamav-milter.c:809

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

 msgstr ""

-#: clamav-milter.c:812

+#: clamav-milter.c:810

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

 msgstr ""

-#: clamav-milter.c:813

+#: clamav-milter.c:811

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

 msgstr ""

-#: clamav-milter.c:814

+#: clamav-milter.c:812

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

 msgstr ""

-#: clamav-milter.c:815

+#: clamav-milter.c:813

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

 msgstr ""

-#: clamav-milter.c:816

+#: clamav-milter.c:814

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

 msgstr ""

-#: clamav-milter.c:817

+#: clamav-milter.c:815

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

 msgstr ""

-#: clamav-milter.c:818

+#: clamav-milter.c:816

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:819

+#: clamav-milter.c:817

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

 msgstr ""

-#: clamav-milter.c:820

+#: clamav-milter.c:818

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

 msgstr ""

-#: clamav-milter.c:821

+#: clamav-milter.c:819

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

 msgstr ""

-#: clamav-milter.c:822

+#: clamav-milter.c:820

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

 msgstr ""

-#: clamav-milter.c:823

+#: clamav-milter.c:821

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

 msgstr ""

-#: clamav-milter.c:825

+#: clamav-milter.c:823

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

 msgstr ""

-#: clamav-milter.c:827

+#: clamav-milter.c:825

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:828

+#: clamav-milter.c:826

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

 msgstr ""

-#: clamav-milter.c:1109

+#: clamav-milter.c:1107

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1118

+#: clamav-milter.c:1116

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1158

+#: clamav-milter.c:1155

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1162

+#: clamav-milter.c:1161

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1173

+#: clamav-milter.c:1172

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1190

+#: clamav-milter.c:1189

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1193

+#: clamav-milter.c:1192

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1195

+#: clamav-milter.c:1194

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1200

+#: clamav-milter.c:1199

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1207

+#: clamav-milter.c:1206

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1223

+#: clamav-milter.c:1222

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1249

+#: clamav-milter.c:1248

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1256

+#: clamav-milter.c:1255

 #, c-format

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

 msgstr ""

@@ -225,353 +225,368 @@ msgstr ""

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

 msgstr ""

-#: clamav-milter.c:1281 clamav-milter.c:1304

+#: clamav-milter.c:1281

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1283

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1293 clamav-milter.c:1316

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1283 clamav-milter.c:1306

+#: clamav-milter.c:1295 clamav-milter.c:1318

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1317

+#: clamav-milter.c:1329

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1329

+#: clamav-milter.c:1345

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1356

+#: clamav-milter.c:1360

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1379

 #, c-format

 msgid "%s: Sessions does not multiplex\n"

 msgstr ""

-#: clamav-milter.c:1372

+#: clamav-milter.c:1402

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1384

+#: clamav-milter.c:1414

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1399

+#: clamav-milter.c:1432

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

 msgstr ""

-#: clamav-milter.c:1400

+#: clamav-milter.c:1433

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1406

+#: clamav-milter.c:1439

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1413

+#: clamav-milter.c:1446

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1414

+#: clamav-milter.c:1447

 msgid "So that you can see all of the messages"

 msgstr ""

-#: clamav-milter.c:1475

+#: clamav-milter.c:1508

 #, c-format

 msgid "Starting: %s"

 msgstr ""

-#: clamav-milter.c:1480

+#: clamav-milter.c:1513

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1484

+#: clamav-milter.c:1517

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1488

+#: clamav-milter.c:1521

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1497

+#: clamav-milter.c:1530

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1499

+#: clamav-milter.c:1532

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1527

+#: clamav-milter.c:1560

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1540

+#: clamav-milter.c:1573

 #, c-format

 msgid "Started: %s"

 msgstr ""

-#: clamav-milter.c:1577 clamav-milter.c:1809

+#: clamav-milter.c:1617 clamav-milter.c:1857

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1580 clamav-milter.c:1816

+#: clamav-milter.c:1622 clamav-milter.c:1866

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

 msgstr ""

-#: clamav-milter.c:1741

+#: clamav-milter.c:1783

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:1812

+#: clamav-milter.c:1860

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1852

+#: clamav-milter.c:1902

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:1861

+#: clamav-milter.c:1911

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:1866

+#: clamav-milter.c:1916

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

 msgstr ""

-#: clamav-milter.c:1868

+#: clamav-milter.c:1918

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:1889

+#: clamav-milter.c:1939

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:1894

+#: clamav-milter.c:1944

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:1915

+#: clamav-milter.c:1965

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:1923

+#: clamav-milter.c:1973

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1924

+#: clamav-milter.c:1974

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1943

+#: clamav-milter.c:1993

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:1948

+#: clamav-milter.c:1998

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1958

+#: clamav-milter.c:2008

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1975

+#: clamav-milter.c:2025

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1993

+#: clamav-milter.c:2043

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:1994

+#: clamav-milter.c:2044

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2002

+#: clamav-milter.c:2052

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2003

+#: clamav-milter.c:2053

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2037

+#: clamav-milter.c:2087

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2038

+#: clamav-milter.c:2088

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2044

+#: clamav-milter.c:2094

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2045

+#: clamav-milter.c:2095

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2050

+#: clamav-milter.c:2100

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2080

+#: clamav-milter.c:2130

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2086

+#: clamav-milter.c:2136

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2088

+#: clamav-milter.c:2138

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

 msgstr ""

-#: clamav-milter.c:2208

+#: clamav-milter.c:2258

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2211

+#: clamav-milter.c:2261

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2268

+#: clamav-milter.c:2318

 msgid "clamfi_eoh: ignoring whitelisted message"

 msgstr ""

-#: clamav-milter.c:2270

+#: clamav-milter.c:2320

 msgid "clamfi_eoh: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2284

+#: clamav-milter.c:2334

 #, c-format

 msgid "clamfi_envbody: %u bytes"

 msgstr ""

-#: clamav-milter.c:2286

+#: clamav-milter.c:2336

 #, c-format

 msgid "clamfi_envbody: %u bytes\n"

 msgstr ""

-#: clamav-milter.c:2296 clamav-milter.c:2487

+#: clamav-milter.c:2346 clamav-milter.c:2545

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2300 clamav-milter.c:2490

+#: clamav-milter.c:2350 clamav-milter.c:2548

 msgid "Not Scanned - StreamMaxLength exceeded"

 msgstr ""

-#: clamav-milter.c:2372 clamav-milter.c:2390 clamav-milter.c:3375

-#: clamav-milter.c:3382

+#: clamav-milter.c:2422 clamav-milter.c:2440 clamav-milter.c:3433

+#: clamav-milter.c:3440

 msgid "send failed to clamd"

 msgstr ""

-#: clamav-milter.c:2407

+#: clamav-milter.c:2457

 #, c-format

 msgid "clamfi_eom: read %s"

 msgstr ""

-#: clamav-milter.c:2408

+#: clamav-milter.c:2458

 #, c-format

 msgid "clamfi_eom: read %s\n"

 msgstr ""

-#: clamav-milter.c:2416

+#: clamav-milter.c:2466

 msgid "clamfi_eom: read nothing from clamd"

 msgstr ""

-#: clamav-milter.c:2418

+#: clamav-milter.c:2468

 msgid "clamfi_eom: read nothing from clamd\n"

 msgstr ""

-#: clamav-milter.c:2453 clamav-milter.c:2476

+#: clamav-milter.c:2503 clamav-milter.c:2534

 msgid "Error determining host"

 msgstr ""

-#: clamav-milter.c:2495

+#: clamav-milter.c:2553

 msgid "Not Scanned"

 msgstr ""

-#: clamav-milter.c:2506

+#: clamav-milter.c:2564

 msgid "Clean"

 msgstr ""

-#: clamav-milter.c:2510

+#: clamav-milter.c:2568

 #, c-format

 msgid "%s: clean message from %s"

 msgstr ""

-#: clamav-milter.c:2512

+#: clamav-milter.c:2570

 msgid "an unknown sender"

 msgstr ""

-#: clamav-milter.c:2546

+#: clamav-milter.c:2604

 msgid "Infected"

 msgstr ""

-#: clamav-milter.c:2564

+#: clamav-milter.c:2622

 #, c-format

 msgid "Intercepted virus from %s to"

 msgstr ""

-#: clamav-milter.c:2658

+#: clamav-milter.c:2716