@@ -1,3 +1,9 @@

+Wed Feb 23 09:42:52 GMT 2005 (njh)

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

+  * clamav-milter:	Remove the pid file on exit

+			Warn if sendmail can't be started when sending

+				interception messages

+

 Sun Feb 20 05:08:54 CET 2005 (tk)

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

   * libclamav: add support for detection based on analysis of archive metadata

@@ -197,6 +197,12 @@ When using UNIX domain sockets via the LocalSocket option of clamd.conf,

 we recommend that you use the --quarantine-dir option since that may improve

 performance.

+If you wish to send a warning when a message is blocked, clamav-milter MUST be

+able to call sendmail, for example on a Fedora Linux system:

+

+	# ls -lL /usr/lib/sendmail

+	-rwxr-sr-x  1 root smmsp 732356 Sep  1 11:16 /usr/lib/sendmail

+

 To test that your clamAV system is now intercepting viruses, visit

 http://www.testvirus.org

@@ -690,6 +696,8 @@ Changes

 			Debug around mkdir/rmdir of tmpdir

 			SESSION mode: not all sessions were closed when quitting

 0.83	13/2/05:	Up issue

+0.83a	23/2/05:	Issue a warning if sendmail can't be executed

+			Remove pidfile, suggested by Stephen Gran <steve@lobefin.net>

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.184  2005/02/23 09:41:39  nigelhorne

+ * Remove the pidfile

+ *

  * Revision 1.183  2005/02/13 20:50:15  nigelhorne

  * 0.83

  *

@@ -560,9 +563,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.183 2005/02/13 20:50:15 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.184 2005/02/23 09:41:39 nigelhorne Exp $";

-#define	CM_VERSION	"0.83"

+#define	CM_VERSION	"0.83a"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -662,7 +665,7 @@ typedef	unsigned int	in_addr_t;

 #define	VERSION_LENGTH	128

-/*#define	SESSION	/*

+#define	SESSION	/*

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

 		 * command connection is created for each new email

 		 *

@@ -952,6 +955,7 @@ static	const	char	*whitelistFile;	/*

 					 * addresses that we don't scan

 					 */

 static	const	char	*sendmailCF;	/* location of sendmail.cf to verify */

+static	const	char	*pidfile;

 #ifdef	CL_DEBUG

 #if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1

@@ -1025,7 +1029,6 @@ main(int argc, char **argv)

 	int i, Bflag = 0;

 	const char *cfgfile = CL_DEFAULT_CFG;

 	const struct cfgstruct *cpt;

-	const char *pidfile = NULL;

 	char version[VERSION_LENGTH + 1];

 	pthread_t tid;

 	struct smfiDesc smfilter = {

@@ -1792,6 +1795,9 @@ main(int argc, char **argv)

 					tmpdir = "/tmp";

 #endif

+		/*

+		 * TODO: investigate mkdtemp on LINUX and possibly others

+		 */

 		tmpdir = cli_gentemp(NULL);

 		cli_dbgmsg("Making %s\n", tmpdir);

@@ -3365,7 +3371,8 @@ clamfi_eom(SMFICTX *ctx)

 				cli_dbgmsg("Waiting for %s to finish\n", cmd);

 				pclose(sendmail);

-			}

+			} else if(use_syslog)

+				syslog(LOG_WARNING, _("Can't execute '%s' to send virus notice"), cmd);

 		}

 		if(quarantine_dir) {

@@ -3955,6 +3962,9 @@ connect2clamd(struct privdata *privdata)

 		int ntries = 5;

 		const char *dir = (tmpdir) ? tmpdir : quarantine_dir;

+		/*

+		 * TODO: investigate mkdtemp on LINUX and possibly others

+		 */

 		if((mkdir(dir, 0700) < 0) && (errno != EEXIST)) {

 			perror(dir);

 			if(use_syslog)

@@ -5046,6 +5056,10 @@ quit(void)

 		if(rmdir(tmpdir) < 0)

 			perror(tmpdir);

+	if(pidfile)

+		if(unlink(pidfile) < 0)

+			perror(pidfile);

+

 	broadcast(_("Stopping clamav-milter"));

 }

@@ -5095,6 +5109,8 @@ loadDatabase(void)

 	daily = cli_malloc(strlen(dbdir) + 11);

 	sprintf(daily, "%s/daily.cvd", dbdir);

+	cli_dbgmsg("loadDatabase: check %s for updates\n", daily);

+

 	d = cl_cvdhead(daily);

 	if(d == NULL) {

@@ -5153,6 +5169,7 @@ loadDatabase(void)

 		cli_errmsg("Database initialization error: %s\n", cl_strerror(ret));

 		return -1;

 	}

+	cli_dbgmsg("Database updated\n");

 	if(use_syslog) {

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

@@ -5277,6 +5294,7 @@ verifyIncomingSocketName(const char *sockName)

  *

  * TODO: Allow regular expressions in the emails

  * TODO: Syntax check the contents of the files

+ * TODO: Allow emails of the form "name <address>"

  */

 static int

 isWhitelisted(const char *emailaddress)

@@ -5303,9 +5321,8 @@ isWhitelisted(const char *emailaddress)

 				case ':':

 					continue;

 			}

-			cli_chomp(buf);

-

-			(void)tableInsert(whitelist, buf, 1);

+			if(cli_chomp(buf) > 0)

+				(void)tableInsert(whitelist, buf, 1);

 		}

 		fclose(fin);

 	}

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

 msgstr ""

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

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

-"POT-Creation-Date: 2005-02-11 22:14+0000\n"

+"POT-Creation-Date: 2005-02-23 09:40+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,689 +16,689 @@ msgstr ""

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

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

-#: clamav-milter.c:975

+#: clamav-milter.c:982

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

 msgstr ""

-#: clamav-milter.c:976

+#: clamav-milter.c:983

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

 msgstr ""

-#: clamav-milter.c:977

+#: clamav-milter.c:984

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:978

+#: clamav-milter.c:985

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

 msgstr ""

-#: clamav-milter.c:979

+#: clamav-milter.c:986

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

 msgstr ""

-#: clamav-milter.c:980

+#: clamav-milter.c:987

 msgid ""

 "\t--detect-forged-local-address\t-L\tReject mails that claim to be from us."

 msgstr ""

-#: clamav-milter.c:981

+#: clamav-milter.c:988

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:982

+#: clamav-milter.c:989

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:983

+#: clamav-milter.c:990

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

 msgstr ""

-#: clamav-milter.c:984

+#: clamav-milter.c:991

 msgid "\t--external\t\t-e\tUse an external scanner (usually clamd)."

 msgstr ""

-#: clamav-milter.c:985

+#: clamav-milter.c:992

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

 msgstr ""

-#: clamav-milter.c:986

+#: clamav-milter.c:993

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

 msgstr ""

-#: clamav-milter.c:987

+#: clamav-milter.c:994

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

 msgstr ""

-#: clamav-milter.c:988

+#: clamav-milter.c:995

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

 msgstr ""

-#: clamav-milter.c:989

+#: clamav-milter.c:996

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

 msgstr ""

-#: clamav-milter.c:990

+#: clamav-milter.c:997

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

 msgstr ""

-#: clamav-milter.c:991

+#: clamav-milter.c:998

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

 msgstr ""

-#: clamav-milter.c:992

+#: clamav-milter.c:999

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

 msgstr ""

-#: clamav-milter.c:993

+#: clamav-milter.c:1000

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

 msgstr ""

-#: clamav-milter.c:994

+#: clamav-milter.c:1001

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

 msgstr ""

-#: clamav-milter.c:995

+#: clamav-milter.c:1002

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

 msgstr ""

-#: clamav-milter.c:996

+#: clamav-milter.c:1003

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

 msgstr ""

-#: clamav-milter.c:997

+#: clamav-milter.c:1004

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

 msgstr ""

-#: clamav-milter.c:998

+#: clamav-milter.c:1005

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

 msgstr ""

-#: clamav-milter.c:999

+#: clamav-milter.c:1006

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

 msgstr ""

-#: clamav-milter.c:1000

+#: clamav-milter.c:1007

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:1001

+#: clamav-milter.c:1008

 msgid "\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify"

 msgstr ""

-#: clamav-milter.c:1002

+#: clamav-milter.c:1009

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

 msgstr ""

-#: clamav-milter.c:1003

+#: clamav-milter.c:1010

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

 msgstr ""

-#: clamav-milter.c:1004

+#: clamav-milter.c:1011

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

 msgstr ""

-#: clamav-milter.c:1005

+#: clamav-milter.c:1012

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

 msgstr ""

-#: clamav-milter.c:1006

+#: clamav-milter.c:1013

 msgid ""

 "\t--whitelist-file=FILE\t-W FILE\tLocation of the file of whitelisted "

 "addresses"

 msgstr ""

-#: clamav-milter.c:1007

+#: clamav-milter.c:1014

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

 msgstr ""

-#: clamav-milter.c:1009

+#: clamav-milter.c:1016

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

 msgstr ""

-#: clamav-milter.c:1011

+#: clamav-milter.c:1018

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:1012

+#: clamav-milter.c:1019

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

 msgstr ""

-#: clamav-milter.c:1323

+#: clamav-milter.c:1329

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1329

+#: clamav-milter.c:1335

 #, c-format

 msgid "%s: socket-addr (%s) doesn't agree with sendmail.cf\n"

 msgstr ""

-#: clamav-milter.c:1337

+#: clamav-milter.c:1343

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1344

+#: clamav-milter.c:1350

 #, c-format

 msgid "%s: --detect-forged-local-addresses is not compatible with --outgoing\n"

 msgstr ""

-#: clamav-milter.c:1348

+#: clamav-milter.c:1354

 #, c-format

 msgid "%s: --detect-forged-local-addresses is not compatible with --local\n"

 msgstr ""

-#: clamav-milter.c:1352

+#: clamav-milter.c:1358

 #, c-format

 msgid "%s: --detect-forged-local-addresses is not compatible with --force\n"

 msgstr ""

-#: clamav-milter.c:1391

+#: clamav-milter.c:1397

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1400

+#: clamav-milter.c:1406

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1411

+#: clamav-milter.c:1417

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1428

+#: clamav-milter.c:1434

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1431

+#: clamav-milter.c:1437

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1433

+#: clamav-milter.c:1439

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1438

+#: clamav-milter.c:1444

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1446

+#: clamav-milter.c:1452

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1452

+#: clamav-milter.c:1458

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1458

+#: clamav-milter.c:1464

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1464

+#: clamav-milter.c:1470

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1481

+#: clamav-milter.c:1487

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1507

+#: clamav-milter.c:1513

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1515

+#: clamav-milter.c:1521

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1538

+#: clamav-milter.c:1544

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1548

+#: clamav-milter.c:1554

 #, c-format

 msgid "%s: --max-children must be given if --external is not given\n"

 msgstr ""

-#: clamav-milter.c:1552

+#: clamav-milter.c:1558

 #, c-format

 msgid "%s: --timeout must not be given if --external is not given\n"

 msgstr ""

-#: clamav-milter.c:1565

+#: clamav-milter.c:1571

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1575

+#: clamav-milter.c:1581

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1577

+#: clamav-milter.c:1583

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1587 clamav-milter.c:1610

+#: clamav-milter.c:1593 clamav-milter.c:1616

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1589 clamav-milter.c:1612

+#: clamav-milter.c:1595 clamav-milter.c:1618

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1623

+#: clamav-milter.c:1629

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1640

+#: clamav-milter.c:1646

 #, c-format

 msgid "%s: --quarantine-dir not supported for TCPSocket - use --quarantine\n"

 msgstr ""

-#: clamav-milter.c:1655

+#: clamav-milter.c:1661

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1674 clamav-milter.c:1757

+#: clamav-milter.c:1680 clamav-milter.c:1763

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1697

+#: clamav-milter.c:1703

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1709

+#: clamav-milter.c:1715

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1726

+#: clamav-milter.c:1732

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

 msgstr ""

-#: clamav-milter.c:1727 clamav-milter.c:1733

+#: clamav-milter.c:1733 clamav-milter.c:1739

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1732

+#: clamav-milter.c:1738

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

 msgstr ""

-#: clamav-milter.c:1739

+#: clamav-milter.c:1745

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1802

+#: clamav-milter.c:1811

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1803

+#: clamav-milter.c:1812

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

 msgstr ""

-#: clamav-milter.c:1864

+#: clamav-milter.c:1873

 #, c-format

 msgid "%s: ScanMail not defined in %s (needed without --external), enabling\n"

 msgstr ""

-#: clamav-milter.c:1925

+#: clamav-milter.c:1934

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1934

+#: clamav-milter.c:1943

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1936

+#: clamav-milter.c:1945

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1969

+#: clamav-milter.c:1978

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1985

+#: clamav-milter.c:1994

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1988

+#: clamav-milter.c:1997

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:2053 clamav-milter.c:2310

+#: clamav-milter.c:2062 clamav-milter.c:2319

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2058

+#: clamav-milter.c:2067

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:2233

+#: clamav-milter.c:2242

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2313

+#: clamav-milter.c:2322

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2319

+#: clamav-milter.c:2328

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

 msgstr ""

-#: clamav-milter.c:2355

+#: clamav-milter.c:2364

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2364

+#: clamav-milter.c:2373

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2369

+#: clamav-milter.c:2378

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

 msgstr ""

-#: clamav-milter.c:2371

+#: clamav-milter.c:2380

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2392

+#: clamav-milter.c:2401

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2397

+#: clamav-milter.c:2406

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2418

+#: clamav-milter.c:2427

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2427

+#: clamav-milter.c:2436

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:2428

+#: clamav-milter.c:2437

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:2431

+#: clamav-milter.c:2440

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2432

+#: clamav-milter.c:2441

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2452

+#: clamav-milter.c:2461

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2461

+#: clamav-milter.c:2470

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2470

+#: clamav-milter.c:2479

 #, c-format

 msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n"

 msgstr ""

-#: clamav-milter.c:2481

+#: clamav-milter.c:2490

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2498

+#: clamav-milter.c:2507

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2516

+#: clamav-milter.c:2525

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2517

+#: clamav-milter.c:2526

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2525

+#: clamav-milter.c:2534

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2526

+#: clamav-milter.c:2535

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2540 clamav-milter.c:2663

+#: clamav-milter.c:2549 clamav-milter.c:2672

 msgid "clamfi_connect: gethostname failed"

 msgstr ""

-#: clamav-milter.c:2545

+#: clamav-milter.c:2554

 msgid "Rejected email falsely claiming to be from here"

 msgstr ""

-#: clamav-milter.c:2546

+#: clamav-milter.c:2555

 msgid "You have claimed to be me, but you are not"

 msgstr ""

-#: clamav-milter.c:2547 clamav-milter.c:2671

+#: clamav-milter.c:2556 clamav-milter.c:2680

 msgid "Forged local address detected"

 msgstr ""

-#: clamav-milter.c:2578

+#: clamav-milter.c:2587

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2579

+#: clamav-milter.c:2588

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2585

+#: clamav-milter.c:2594

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2586

+#: clamav-milter.c:2595

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2591

+#: clamav-milter.c:2600

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2624

+#: clamav-milter.c:2633

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2630

+#: clamav-milter.c:2639

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2632

+#: clamav-milter.c:2641

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

 msgstr ""

-#: clamav-milter.c:2669

+#: clamav-milter.c:2678

 #, c-format

 msgid "Rejected email falsely claiming to be from %s"

 msgstr ""

-#: clamav-milter.c:2670

+#: clamav-milter.c:2679

 msgid "You have claimed to be from me, but you are not"

 msgstr ""

-#: clamav-milter.c:2777

+#: clamav-milter.c:2786

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2780

+#: clamav-milter.c:2789

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2828

+#: clamav-milter.c:2837

 msgid "clamfi_eoh: ignoring whitelisted message"

 msgstr ""

-#: clamav-milter.c:2830

+#: clamav-milter.c:2839

 msgid "clamfi_eoh: ignoring whitelisted message\n"

 msgstr ""

-#: clamav-milter.c:2844

+#: clamav-milter.c:2853

 #, c-format

 msgid "clamfi_envbody: %u bytes"

 msgstr ""

-#: clamav-milter.c:2846

+#: clamav-milter.c:2855

 #, c-format

 msgid "clamfi_envbody: %u bytes\n"

 msgstr ""