@@ -1,3 +1,8 @@

+Sat Dec  4 23:34:54 GMT 2004 (njh)

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

+  * clamav-milter:	Fix possible mishandling of multiple children when

+				searching for a free server

+

 Sat Dec  4 17:04:40 GMT 2004 (njh)

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

   * libclamav/blob.c:	Fixed filename handling in MACOS/X

@@ -575,6 +575,7 @@ Changes

 		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

+0.80x	4/12/04: findServer() could return values out of range

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.158  2004/12/04 23:33:47  nigelhorne

+ * Remove possible array overflow when looking for a free server

+ *

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

  * internal: Honour scanning modes and archive limits

  *

@@ -482,9 +485,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.157 2004/12/03 17:34:58 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.158 2004/12/04 23:33:47 nigelhorne Exp $";

-#define	CM_VERSION	"0.80w"

+#define	CM_VERSION	"0.80x"

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

@@ -824,13 +827,13 @@ static	char	*port = NULL;	/* sendmail->milter comms */

 static	const	char	*serverHostNames = "127.0.0.1";

 static	long	*serverIPs;	/* IPv4 only */

-static	int	numServers;	/* number of elements in sessions array */

+static	int	numServers;	/* number of elements in serverIPs array */

 #ifdef	SESSION

 static	struct	session {

 	int	sock;	/* fd */

 	enum	{ CMDSOCKET_FREE, CMDSOCKET_INUSE, CMDSOCKET_DOWN }	status;

-} *sessions;

+} *sessions;	/* max_children elements in the array */

 static	pthread_mutex_t sstatus_mutex = PTHREAD_MUTEX_INITIALIZER;

 static	pthread_cond_t	watchdog_cond = PTHREAD_COND_INITIALIZER;

@@ -1396,6 +1399,7 @@ main(int argc, char **argv)

 		}

 		if(loadDatabase() != 0)

 			return EX_CONFIG;

+		numServers = 1;

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

 #ifdef	SESSION

 		struct sockaddr_un server;

@@ -1782,8 +1786,7 @@ main(int argc, char **argv)

 	signal(SIGPIPE, SIG_IGN);

 	if(use_syslog) {

-		if(logVerbose)

-			syslog(LOG_INFO, _("Starting: %s"), clamav_version);

+		syslog(LOG_INFO, _("Starting %s"), clamav_version);

 #ifdef	CL_DEBUG

 		if(debug_level > 0)

 			syslog(LOG_DEBUG, _("Debugging is on"));

@@ -1809,6 +1812,8 @@ createSession(int s)

 	const int serverNumber = s % numServers;

 	struct session *session = &sessions[s];

+	assert(s < max_children);

+

 	memset((char *)&server, 0, sizeof(struct sockaddr_in));

 	server.sin_family = AF_INET;

 	server.sin_port = (in_port_t)htons(tcpSocket);

@@ -1973,7 +1978,7 @@ pingServer(int serverNumber)

 static int

 findServer(void)

 {

-	int i;

+	int i, j;

 	struct session *session;

 	/*

@@ -1983,17 +1988,21 @@ findServer(void)

 	pthread_mutex_lock(&n_children_mutex);

 	assert(n_children > 0);

 	assert(n_children <= max_children);

-	i = n_children - 1;

+	i = 0;

+	j = n_children - 1;

 	pthread_mutex_unlock(&n_children_mutex);

-	session = sessions;

 	pthread_mutex_lock(&sstatus_mutex);

-	for(; i < max_children; i++, session++)

+	for(; i < max_children; i++) {

+		session = &sessions[(j + i) % max_children];

+		cli_dbgmsg("findServer: try server %d\n",

+			(j + i) % max_children);

 		if(session->status == CMDSOCKET_FREE) {

 			session->status = CMDSOCKET_INUSE;

 			pthread_mutex_unlock(&sstatus_mutex);

 			return i;

 		}

+	}

 	pthread_mutex_unlock(&sstatus_mutex);

 	if(pthread_cond_broadcast(&watchdog_cond) < 0)

@@ -2002,12 +2011,14 @@ findServer(void)

 	i = 0;

 	session = sessions;

 	pthread_mutex_lock(&sstatus_mutex);

-	for(; i < max_children; i++, session++)

+	for(; i < max_children; i++, session++) {

+		cli_dbgmsg("findServer: try server %d\n", i);

 		if(session->status == CMDSOCKET_FREE) {

 			session->status = CMDSOCKET_INUSE;

 			pthread_mutex_unlock(&sstatus_mutex);

 			return i;

 		}

+	}

 	pthread_mutex_unlock(&sstatus_mutex);

 	cli_warnmsg(_("No free clamd sessions\n"));

@@ -2199,9 +2210,15 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 #ifdef	CL_DEBUG

 	if(debug_level >= 4) {

-		if(use_syslog)

-			syslog(LOG_NOTICE, _("clamfi_connect: connection from %s [%s]"), hostname, remoteIP);

-		cli_dbgmsg(_("clamfi_connect: connection from %s [%s]\n"), hostname, remoteIP);

+		if(hostname[0] == '[') {

+			if(use_syslog)

+				syslog(LOG_NOTICE, _("clamfi_connect: connection from %s"), remoteIP);

+			cli_dbgmsg(_("clamfi_connect: connection from %s\n"), remoteIP);

+		} else {

+			if(use_syslog)

+				syslog(LOG_NOTICE, _("clamfi_connect: connection from %s [%s]"), hostname, remoteIP);

+			cli_dbgmsg(_("clamfi_connect: connection from %s [%s]\n"), hostname, remoteIP);

+		}

 	}

 #endif

@@ -2304,14 +2321,12 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 		pthread_mutex_lock(&n_children_mutex);

 		/*

-		 * Not a while since sendmail doesn't like it if we

+		 * Wait a while since sendmail doesn't like it if we

 		 * take too long replying. Effectively this means that

 		 * max_children is more of a hint than a rule

 		 */

 		if(n_children >= max_children) {

-			struct timeval now;

 			struct timespec timeout;

-			struct timezone tz;

 			cli_dbgmsg((dont_wait) ?

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

@@ -2343,6 +2358,9 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 			 * ensure it wakes up when a child goes away

 			 */

 			if(child_timeout) {

+				struct timeval now;

+				struct timezone tz;

+

 				gettimeofday(&now, &tz);

 				timeout.tv_sec = now.tv_sec + child_timeout;

 				timeout.tv_nsec = 0;

@@ -3720,6 +3738,7 @@ connect2clamd(struct privdata *privdata)

 			freeServer = findServer();

 			if(freeServer < 0)

 				return 0;

+			assert(freeServer < max_children);

 #else

 			struct sockaddr_in server;

@@ -3732,6 +3751,7 @@ connect2clamd(struct privdata *privdata)

 			freeServer = findServer();

 			if(freeServer < 0)

 				return 0;

+			assert(freeServer < max_children);

 			server.sin_addr.s_addr = serverIPs[freeServer];

@@ -3777,7 +3797,9 @@ 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, _("failed to send STREAM command clamd"));

+				syslog(LOG_ERR, _("failed to send STREAM command clamd server %d"),

+					freeServer);

+

 			return 0;

 		}

 #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-03 17:34+0000\n"

+"POT-Creation-Date: 2004-12-04 23:31+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,596 +16,606 @@ msgstr ""

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

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

-#: clamav-milter.c:871

+#: clamav-milter.c:874

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

 msgstr ""

-#: clamav-milter.c:872

+#: clamav-milter.c:875

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

 msgstr ""

-#: clamav-milter.c:873

+#: clamav-milter.c:876

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:874

+#: clamav-milter.c:877

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

 msgstr ""

-#: clamav-milter.c:875

+#: clamav-milter.c:878

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

 msgstr ""

-#: clamav-milter.c:876

+#: clamav-milter.c:879

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:877

+#: clamav-milter.c:880

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:878

+#: clamav-milter.c:881

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

 msgstr ""

-#: clamav-milter.c:879

+#: clamav-milter.c:882

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

 msgstr ""

-#: clamav-milter.c:880

+#: clamav-milter.c:883

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

 msgstr ""

-#: clamav-milter.c:881

+#: clamav-milter.c:884

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

 msgstr ""

-#: clamav-milter.c:882

+#: clamav-milter.c:885

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

 msgstr ""

-#: clamav-milter.c:883

+#: clamav-milter.c:886

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

 msgstr ""

-#: clamav-milter.c:884

+#: clamav-milter.c:887

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

 msgstr ""

-#: clamav-milter.c:885

+#: clamav-milter.c:888

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

 msgstr ""

-#: clamav-milter.c:886

+#: clamav-milter.c:889

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

 msgstr ""

-#: clamav-milter.c:887

+#: clamav-milter.c:890

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

 msgstr ""

-#: clamav-milter.c:888

+#: clamav-milter.c:891

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

 msgstr ""

-#: clamav-milter.c:889

+#: clamav-milter.c:892

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

 msgstr ""

-#: clamav-milter.c:890

+#: clamav-milter.c:893

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

 msgstr ""

-#: clamav-milter.c:891

+#: clamav-milter.c:894

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

 msgstr ""

-#: clamav-milter.c:892

+#: clamav-milter.c:895

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

 msgstr ""

-#: clamav-milter.c:893

+#: clamav-milter.c:896

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

 msgstr ""

-#: clamav-milter.c:894

+#: clamav-milter.c:897

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

 msgstr ""

-#: clamav-milter.c:895

+#: clamav-milter.c:898

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:896

+#: clamav-milter.c:899

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

 msgstr ""

-#: clamav-milter.c:897

+#: clamav-milter.c:900

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

 msgstr ""

-#: clamav-milter.c:898

+#: clamav-milter.c:901

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

 msgstr ""

-#: clamav-milter.c:899

+#: clamav-milter.c:902

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

 msgstr ""

-#: clamav-milter.c:900

+#: clamav-milter.c:903

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

 msgstr ""

-#: clamav-milter.c:902

+#: clamav-milter.c:905

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

 msgstr ""

-#: clamav-milter.c:904

+#: clamav-milter.c:907

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:905

+#: clamav-milter.c:908

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

 msgstr ""

-#: clamav-milter.c:1197

+#: clamav-milter.c:1200

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1206

+#: clamav-milter.c:1209

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1245

+#: clamav-milter.c:1248

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1254

+#: clamav-milter.c:1257

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1265

+#: clamav-milter.c:1268

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1282

+#: clamav-milter.c:1285

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1285

+#: clamav-milter.c:1288

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1287

+#: clamav-milter.c:1290

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1292

+#: clamav-milter.c:1295

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1299

+#: clamav-milter.c:1302

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1315

+#: clamav-milter.c:1318

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1341

+#: clamav-milter.c:1344

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1349

+#: clamav-milter.c:1352

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1372

+#: clamav-milter.c:1375

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1382

+#: clamav-milter.c:1385

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1387

+#: clamav-milter.c:1390

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1391

+#: clamav-milter.c:1394

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1403

+#: clamav-milter.c:1407

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1413

+#: clamav-milter.c:1417

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1415

+#: clamav-milter.c:1419

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1429 clamav-milter.c:1452

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1431 clamav-milter.c:1454

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1461

+#: clamav-milter.c:1465

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1478

+#: clamav-milter.c:1482

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1493

+#: clamav-milter.c:1497

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1512

+#: clamav-milter.c:1516

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1535

+#: clamav-milter.c:1539

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1547

+#: clamav-milter.c:1551

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1564

+#: clamav-milter.c:1568

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

 msgstr ""

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

+#: clamav-milter.c:1569 clamav-milter.c:1575

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1570

+#: clamav-milter.c:1574

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

 msgstr ""

-#: clamav-milter.c:1577

+#: clamav-milter.c:1581

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1628

+#: clamav-milter.c:1632

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1629

+#: clamav-milter.c:1633

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

 msgstr ""

-#: clamav-milter.c:1730

+#: clamav-milter.c:1734

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1739

+#: clamav-milter.c:1743

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1741

+#: clamav-milter.c:1745

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1769

+#: clamav-milter.c:1773

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1783

+#: clamav-milter.c:1786

 #, c-format

-msgid "Starting: %s"

+msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1786

+#: clamav-milter.c:1789

 msgid "Debugging is on"

 msgstr ""

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

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

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1850 clamav-milter.c:2104

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

 msgstr ""

-#: clamav-milter.c:2010

+#: clamav-milter.c:2021

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2087

+#: clamav-milter.c:2098

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2129

+#: clamav-milter.c:2140

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2138

+#: clamav-milter.c:2149

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2143

+#: clamav-milter.c:2154

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

 msgstr ""

-#: clamav-milter.c:2145

+#: clamav-milter.c:2156

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2166

+#: clamav-milter.c:2177

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2171

+#: clamav-milter.c:2182

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2192

+#: clamav-milter.c:2203

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2200

+#: clamav-milter.c:2212

+#, c-format

+msgid "clamfi_connect: connection from %s"

+msgstr ""

+

+#: clamav-milter.c:2213

+#, c-format

+msgid "clamfi_connect: connection from %s\n"

+msgstr ""

+

+#: clamav-milter.c:2216

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2201

+#: clamav-milter.c:2217

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2220

+#: clamav-milter.c:2237

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2225

+#: clamav-milter.c:2242

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2235

+#: clamav-milter.c:2252

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2252

+#: clamav-milter.c:2269

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2270

+#: clamav-milter.c:2287

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2271

+#: clamav-milter.c:2288

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2279

+#: clamav-milter.c:2296

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2280

+#: clamav-milter.c:2297

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2314

+#: clamav-milter.c:2329

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2315

+#: clamav-milter.c:2330

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2321

+#: clamav-milter.c:2336

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2322

+#: clamav-milter.c:2337

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2327

+#: clamav-milter.c:2342

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2357

+#: clamav-milter.c:2375

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2363

+#: clamav-milter.c:2381

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2365

+#: clamav-milter.c:2383

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

 msgstr ""

-#: clamav-milter.c:2475

+#: clamav-milter.c:2493

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2503

+#: clamav-milter.c:2521

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2506

+#: clamav-milter.c:2524

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2563

+#: clamav-milter.c:2581

 msgid "clamfi_eoh: ignoring whitelisted message"

 msgstr ""

-#: clamav-milter.c:2565

+#: clamav-milter.c:2583

 msgid "clamfi_eoh: ignoring whitelisted message\n"

 msgstr ""

-#: clamav-milter.c:2579

+#: clamav-milter.c:2597

 #, c-format

 msgid "clamfi_envbody: %u bytes"

 msgstr ""

-#: clamav-milter.c:2581

+#: clamav-milter.c:2599

 #, c-format

 msgid "clamfi_envbody: %u bytes\n"

 msgstr ""

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

+#: clamav-milter.c:2609 clamav-milter.c:2867

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:2613 clamav-milter.c:2870

 msgid "Not Scanned - StreamMaxLength exceeded"

 msgstr ""

-#: clamav-milter.c:2693

+#: clamav-milter.c:2711

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2715

+#: clamav-milter.c:2733

 msgid "failed to send SCAN command to clamd"

 msgstr ""

-#: clamav-milter.c:2731

+#: clamav-milter.c:2749

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2742

+#: clamav-milter.c:2760

 #, c-format

 msgid "clamfi_eom: read %s"

 msgstr ""

-#: clamav-milter.c:2743

+#: clamav-milter.c:2761

 #, c-format

 msgid "clamfi_eom: read %s\n"

 msgstr ""

-#: clamav-milter.c:2751

+#: clamav-milter.c:2769

 msgid "clamfi_eom: read nothing from clamd"

 msgstr ""

-#: clamav-milter.c:2753

+#: clamav-milter.c:2771

 msgid "clamfi_eom: read nothing from clamd\n"

 msgstr ""