@@ -611,6 +611,10 @@ Changes

 		Fix compilation error if is SESSION not defined.

 		Quarantine files could lose the date from the path

 0.80aa	7/12/04: Daily quarantine directories were not always being created

+0.80bb	12/12/04: On Linux store the -ve process group in the pid file to

+			ensure that all threads are sent signals

+		Support the temporary and quarantine directories being on

+			different filesystems

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.162  2004/12/13 11:17:15  nigelhorne

+ * Handle cross file system quarantine

+ *

  * Revision 1.161  2004/12/07 19:23:48  nigelhorne

  * Ensure that the qurantine daily directory is created

  *

@@ -494,9 +497,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.161 2004/12/07 19:23:48 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.162 2004/12/13 11:17:15 nigelhorne Exp $";

-#define	CM_VERSION	"0.80aa"

+#define	CM_VERSION	"0.80bb"

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

@@ -545,6 +548,7 @@ static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.161 2004/12/07 19:23:48 ni

 #include <sys/param.h>

 #ifdef	C_LINUX

+#include <sys/sendfile.h>

 #include <libintl.h>

 #include <locale.h>

@@ -705,6 +709,7 @@ static	int	connect2clamd(struct privdata *privdata);

 static	void	checkClamd(void);

 static	int	sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *virusname);

 static	int	qfile(struct privdata *privdata, const char *sendmailId, const char *virusname);

+static	int	move(const char *oldfile, const char *newfile);

 static	void	setsubject(SMFICTX *ctx, const char *virusname);

 static	int	clamfi_gethostbyname(const char *hostname, struct hostent *hp, char *buf, size_t len);

 static	int	isLocalAddr(in_addr_t addr);

@@ -1781,7 +1786,12 @@ main(int argc, char **argv)

 					pidfile);

 			cli_warnmsg(_("Can't save PID in file %s\n"), pidfile);

 		} else {

+#ifdef	C_LINUX

+			/* Ensure that all threads are kill()ed */

+			fprintf(fd, "-%d\n", (int)getpgrp());

+#else

 			fprintf(fd, "%d\n", (int)getpid());

+#endif

 			fclose(fd);

 		}

 		umask(old_umask);

@@ -4193,12 +4203,7 @@ qfile(struct privdata *privdata, const char *sendmailId, const char *virusname)

 	}

 	cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);

-	/*

-	 * FIXME: handle cross file linking failure meaning that we'd have

-	 *	to copy

-	 */

-#ifdef	C_LINUX

-	if(rename(privdata->filename, newname) < 0) {

+	if(move(privdata->filename, newname) < 0) {

 		perror(newname);

 		if(use_syslog)

 			syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"),

@@ -4206,17 +4211,6 @@ qfile(struct privdata *privdata, const char *sendmailId, const char *virusname)

 		free(newname);

 		return -1;

 	}

-#else

-	if(link(privdata->filename, newname) < 0) {

-		perror(newname);

-		if(use_syslog)

-			syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"),

-				privdata->filename, newname);

-		free(newname);

-		return -1;

-	}

-	unlink(privdata->filename);

-#endif

 	free(privdata->filename);

 	privdata->filename = newname;

@@ -4227,6 +4221,81 @@ qfile(struct privdata *privdata, const char *sendmailId, const char *virusname)

 }

 /*

+ * Move oldfile to newfile using the fastest possible method

+ */

+static int

+move(const char *oldfile, const char *newfile)

+{

+	int ret;

+#ifdef	C_LINUX

+	struct stat statb;

+	int fin, fout;

+	off_t offset;

+

+	ret = rename(oldfile, newfile);

+#else

+	FILE *fin, *fout;

+	int c;

+

+	ret = link(oldfile, newfile);

+#endif

+

+	if(ret >= 0)

+		return 0;

+	if((ret < 0) && (errno != EXDEV)) {

+		perror(newfile);

+		return -1;

+	}

+

+#ifdef	C_LINUX	/* >= 2.2 */

+	fin = open(oldfile, O_RDONLY);

+	if(fin < 0) {

+		perror(oldfile);

+		return -1;

+	}

+

+	if(fstat(fin, &statb) < 0) {

+		perror(oldfile);

+		close(fin);

+		return -1;

+	}

+	fout = open(newfile, O_WRONLY|O_CREAT, 0600);

+	if(fout < 0) {

+		perror(newfile);

+		close(fin);

+		return -1;

+	}

+	offset = (off_t)0;

+	ret = sendfile(fout, fin, &offset, statb.st_size);

+	close(fin);

+	if(ret < 0) {

+		perror(newfile);

+		close(fout);

+		unlink(newfile);

+		return -1;

+	}

+	close(fout);

+#else

+	fin = fopen(oldfile, "r");

+	if(fin == NULL)

+		return -1;

+

+	fout = fopen(newfile, "w");

+	if(fout == NULL) {

+		fclose(fin);

+		return -1;

+	}

+	while((c = getc(fin)) != EOF)

+		putc(c, fout);

+

+	fclose(fin);

+	fclose(fout);

+#endif

+

+	return unlink(oldfile);

+}

+

+/*

  * Store the name of the virus in the subject of the e-mail

  */

 static void

@@ -4248,6 +4317,7 @@ setsubject(SMFICTX *ctx, const char *virusname)

 /*

  * TODO: gethostbyname_r is non-standard so different operating

  * systems do it in different ways. Need more examples

+ * Perhaps we could use res_search()?

  *

  * Returns 0 for success

  */

@@ -4683,7 +4753,8 @@ static int

 loadDatabase(void)

 {

 	extern const char *cl_retdbdir(void);	/* FIXME: should be included */

-	int ret, signatures, v;

+	int ret, v;

+	unsigned int signatures;

 	time_t t;

 	char *daily, *ptr;

 	struct cl_cvd *d;

@@ -4756,7 +4827,7 @@ loadDatabase(void)

 		return -1;

 	}

 	if(use_syslog)

-		syslog(LOG_INFO, _("ClamAV: Protecting against %d viruses"), signatures);

+		syslog(LOG_INFO, _("ClamAV: Protecting against %u viruses"), signatures);

 	if(use_syslog)

 		syslog(LOG_INFO, _("Loaded %s\n"), clamav_version);

@@ -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-06 22:31+0000\n"

+"POT-Creation-Date: 2004-12-13 11:16+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,621 +16,621 @@ msgstr ""

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

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

-#: clamav-milter.c:883

+#: clamav-milter.c:888

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

 msgstr ""

-#: clamav-milter.c:884

+#: clamav-milter.c:889

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

 msgstr ""

-#: clamav-milter.c:885

+#: clamav-milter.c:890

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:886

+#: clamav-milter.c:891

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

 msgstr ""

-#: clamav-milter.c:887

+#: clamav-milter.c:892

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

 msgstr ""

-#: clamav-milter.c:888

+#: clamav-milter.c:893

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:889

+#: clamav-milter.c:894

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:890

+#: clamav-milter.c:895

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

 msgstr ""

-#: clamav-milter.c:891

+#: clamav-milter.c:896

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

 msgstr ""

-#: clamav-milter.c:892

+#: clamav-milter.c:897

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

 msgstr ""

-#: clamav-milter.c:893

+#: clamav-milter.c:898

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

 msgstr ""

-#: clamav-milter.c:894

+#: clamav-milter.c:899

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

 msgstr ""

-#: clamav-milter.c:895

+#: clamav-milter.c:900

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

 msgstr ""

-#: clamav-milter.c:896

+#: clamav-milter.c:901

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

 msgstr ""

-#: clamav-milter.c:897

+#: clamav-milter.c:902

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

 msgstr ""

-#: clamav-milter.c:898

+#: clamav-milter.c:903

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

 msgstr ""

-#: clamav-milter.c:899

+#: clamav-milter.c:904

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

 msgstr ""

-#: clamav-milter.c:900

+#: clamav-milter.c:905

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

 msgstr ""

-#: clamav-milter.c:901

+#: clamav-milter.c:906

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

 msgstr ""

-#: clamav-milter.c:902

+#: clamav-milter.c:907

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

 msgstr ""

-#: clamav-milter.c:903

+#: clamav-milter.c:908

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

 msgstr ""

-#: clamav-milter.c:904

+#: clamav-milter.c:909

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

 msgstr ""

-#: clamav-milter.c:905

+#: clamav-milter.c:910

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

 msgstr ""

-#: clamav-milter.c:906

+#: clamav-milter.c:911

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

 msgstr ""

-#: clamav-milter.c:907

+#: clamav-milter.c:912

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:908

+#: clamav-milter.c:913

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

 msgstr ""

-#: clamav-milter.c:909

+#: clamav-milter.c:914

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

 msgstr ""

-#: clamav-milter.c:910

+#: clamav-milter.c:915

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

 msgstr ""

-#: clamav-milter.c:911

+#: clamav-milter.c:916

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

 msgstr ""

-#: clamav-milter.c:912

+#: clamav-milter.c:917

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

 msgstr ""

-#: clamav-milter.c:914

+#: clamav-milter.c:919

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

 msgstr ""

-#: clamav-milter.c:916

+#: clamav-milter.c:921

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:917

+#: clamav-milter.c:922

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

 msgstr ""

-#: clamav-milter.c:1209

+#: clamav-milter.c:1214

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1218

+#: clamav-milter.c:1223

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1257

+#: clamav-milter.c:1262

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1266

+#: clamav-milter.c:1271

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1277

+#: clamav-milter.c:1282

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1294

+#: clamav-milter.c:1299

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1297

+#: clamav-milter.c:1302

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1299

+#: clamav-milter.c:1304

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1304

+#: clamav-milter.c:1309

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1312

+#: clamav-milter.c:1317

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1318

+#: clamav-milter.c:1323

 #, c-format

 msgid "%s: the quarantine directory must not contain the string 'ERROR'\n"

 msgstr ""

-#: clamav-milter.c:1324

+#: clamav-milter.c:1329

 #, c-format

 msgid "%s: the quarantine directory must not contain the string 'FOUND'\n"

 msgstr ""

-#: clamav-milter.c:1330

+#: clamav-milter.c:1335

 #, c-format

 msgid "%s: the quarantine directory must not contain the string 'OK'\n"

 msgstr ""

-#: clamav-milter.c:1347

+#: clamav-milter.c:1352

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1373

+#: clamav-milter.c:1378

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1381

+#: clamav-milter.c:1386

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1404

+#: clamav-milter.c:1409

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1414

+#: clamav-milter.c:1419

 #, c-format

 msgid "%s: ScanMail not defined in %s (needed with --internal)\n"

 msgstr ""

-#: clamav-milter.c:1419

+#: clamav-milter.c:1424

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1423

+#: clamav-milter.c:1428

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1436

+#: clamav-milter.c:1441

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1446

+#: clamav-milter.c:1451

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1448

+#: clamav-milter.c:1453

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1458 clamav-milter.c:1481

+#: clamav-milter.c:1463 clamav-milter.c:1486

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1460 clamav-milter.c:1483

+#: clamav-milter.c:1465 clamav-milter.c:1488

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1494

+#: clamav-milter.c:1499

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1511

+#: clamav-milter.c:1516

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1526

+#: clamav-milter.c:1531

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1545

+#: clamav-milter.c:1550

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1568

+#: clamav-milter.c:1573

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1580

+#: clamav-milter.c:1585

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1597

+#: clamav-milter.c:1602

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

 msgstr ""

-#: clamav-milter.c:1598 clamav-milter.c:1604

+#: clamav-milter.c:1603 clamav-milter.c:1609

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1603

+#: clamav-milter.c:1608

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

 msgstr ""

-#: clamav-milter.c:1610

+#: clamav-milter.c:1615

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1666

+#: clamav-milter.c:1671

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1667

+#: clamav-milter.c:1672

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

 msgstr ""

-#: clamav-milter.c:1768

+#: clamav-milter.c:1773

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1777

+#: clamav-milter.c:1782

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1779

+#: clamav-milter.c:1784

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1807

+#: clamav-milter.c:1817

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1820

+#: clamav-milter.c:1830

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1823

+#: clamav-milter.c:1833

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1879 clamav-milter.c:2136

+#: clamav-milter.c:1889 clamav-milter.c:2146

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1884 clamav-milter.c:2145

+#: clamav-milter.c:1894 clamav-milter.c:2155

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

 msgstr ""

-#: clamav-milter.c:2059

+#: clamav-milter.c:2069

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2139

+#: clamav-milter.c:2149

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2181

+#: clamav-milter.c:2191

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2190

+#: clamav-milter.c:2200

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2195

+#: clamav-milter.c:2205

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

 msgstr ""

-#: clamav-milter.c:2197

+#: clamav-milter.c:2207

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2218

+#: clamav-milter.c:2228

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2223

+#: clamav-milter.c:2233

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2244

+#: clamav-milter.c:2254

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2253

+#: clamav-milter.c:2263

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:2254

+#: clamav-milter.c:2264

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:2257

+#: clamav-milter.c:2267

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2258

+#: clamav-milter.c:2268

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2278

+#: clamav-milter.c:2288

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2283

+#: clamav-milter.c:2293

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2293

+#: clamav-milter.c:2303

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2310

+#: clamav-milter.c:2320

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2328

+#: clamav-milter.c:2338

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2329

+#: clamav-milter.c:2339

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2337

+#: clamav-milter.c:2347

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2338

+#: clamav-milter.c:2348

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2370

+#: clamav-milter.c:2380

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2371

+#: clamav-milter.c:2381

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2377

+#: clamav-milter.c:2387

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2378

+#: clamav-milter.c:2388

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2383

+#: clamav-milter.c:2393

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2416

+#: clamav-milter.c:2426

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2422

+#: clamav-milter.c:2432

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2424

+#: clamav-milter.c:2434

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

 msgstr ""

-#: clamav-milter.c:2534

+#: clamav-milter.c:2544

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2562

+#: clamav-milter.c:2572

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2565

+#: clamav-milter.c:2575

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2622

+#: clamav-milter.c:2632

 msgid "clamfi_eoh: ignoring whitelisted message"

 msgstr ""

-#: clamav-milter.c:2624

+#: clamav-milter.c:2634

 msgid "clamfi_eoh: ignoring whitelisted message\n"

 msgstr ""

-#: clamav-milter.c:2638

+#: clamav-milter.c:2648

 #, c-format

 msgid "clamfi_envbody: %u bytes"

 msgstr ""

-#: clamav-milter.c:2640

+#: clamav-milter.c:2650

 #, c-format

 msgid "clamfi_envbody: %u bytes\n"

 msgstr ""

-#: clamav-milter.c:2650 clamav-milter.c:2908

+#: clamav-milter.c:2660 clamav-milter.c:2918

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2654 clamav-milter.c:2911

+#: clamav-milter.c:2664 clamav-milter.c:2921

 msgid "Not Scanned - StreamMaxLength exceeded"

 msgstr ""

-#: clamav-milter.c:2752

+#: clamav-milter.c:2762

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2774

+#: clamav-milter.c:2784

 msgid "failed to send SCAN command to clamd"

 msgstr ""

-#: clamav-milter.c:2790

+#: clamav-milter.c:2800

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2801

+#: clamav-milter.c:2811

 #, c-format