@@ -1,3 +1,10 @@

+Wed May  4 20:15:33 BST 2005 (njh)

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

+  * libclamav/mbox.c:	Remove old unused RFC1341 parts

+  * clamav-milter:	Better handling of log file errors

+  			Always send 451 when loading a new database when

+				--external is not set

+

 Wed May  4 13:58:59 BST 2005 (njh)

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

   * libclamav/tnef.c:	If a parse fails and debugging is on, the file being

@@ -16,7 +16,8 @@ Fails to compile on Linux/x86 with icc6.0 (complains about stdio.h...)

 Fails to build on Linux/x86 with icc7.1 with -ipo (fails on libclamav.a - keeps saying run ranlib). Otherwise it builds and runs OK.

 	icc -O2 -tpp7 -xiMKW -parallel -i_dynamic -w2 -march=pentium4 -mcpu=pentium4 clamav-milter.c...

-Tested with Electric Fence 2.2.2

+Tested with Electric Fence 2.2.2, and the bounds checking C compiler from

+	http://web.inter.nl.net/hcc/Haj.Ten.Brugge/

 Compiles OK on Linux/ppc (YDL2.3) with gcc2.95.4. Needs -lsmutil to link.

 	cc -O3 -pedantic -Wuninitialized -Wall -pipe -fomit-frame-pointer -ffast-math -finline-functions -funroll-loop -pthread -lmilter ../libclamav/.libs/libclamav.a ../clamd/cfgfile.o ../clamd/others.o -lsmutil

@@ -761,6 +762,9 @@ Changes

 0.84e	18/4/05:	Fixed a multi-threading problem relating to updating

 				the database when in internal mode

 			Use HAVE_CTIME_R_[23]

+0.84f	4/5/05:		Better handling of open failures for LogFile

+			Always send 451 when reloading a database, even if

+				dont-wait isn't set

 4. INTERNATIONALISATION

@@ -775,6 +779,10 @@ author an e-mail.

 Please send bug reports and/or comments to Nigel Horne <njh@despammed.com> or

 bugs@clamav.net.

+Various tips will go here, for example

+	define(`confMILTER_LOG_LEVEL',`22')

+Running in the foreground, valgrind, LogSyslog, LogVerbose, LogFile etc.

+

 6. TODO

 There are several ideas marked as TODO in the source code. If anyone has

@@ -22,9 +22,9 @@

  *

  * For installation instructions see the file INSTALL that came with this file

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.192 2005/04/18 10:53:34 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.193 2005/05/04 19:15:08 nigelhorne Exp $";

-#define	CM_VERSION	"0.84e"

+#define	CM_VERSION	"0.84f"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -1029,8 +1029,13 @@ main(int argc, char **argv)

 	if(cfgopt(copt, "LogSyslog")) {

 		int fac = LOG_LOCAL6;

-		if(cfgopt(copt, "LogVerbose"))

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

 			logVerbose = 1;

+#if	0

+			/* Only supported by Sendmail >= V8.13 */

+			smfi_setdbg(6);

+#endif

+		}

 		use_syslog = 1;

 		if((cpt = cfgopt(copt, "LogFacility")) != NULL)

@@ -1329,7 +1334,6 @@ main(int argc, char **argv)

 #ifndef	CL_DEBUG

 		close(1);

-		close(2);

 		if((cpt = cfgopt(copt, "LogFile"))) {

 			logFile = cpt->strarg;

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

 				fprintf(stderr, "%s: LogFile requires full path\n", argv[0]);

 				return EX_CONFIG;

 			}

-		} else

+			if(open(logFile, O_WRONLY|O_APPEND) < 0) {

+				perror(logFile);

+				return EX_CANTCREAT;

+			}

+		} else {

 			logFile = "/dev/console";

+			if(open(logFile, O_WRONLY) < 0) {

+				perror(logFile);

+				return EX_OSFILE;

+			}

+		}

-		if((open(logFile, O_WRONLY|O_APPEND) == 1) ||

-		   (open("/dev/null", O_WRONLY) == 1))

-			dup(1);

+		close(2);

+		dup(1);

 		if(cfgopt(copt, "LogTime"))

 			logTime++;

 #endif	/*!CL_DEBUG*/

@@ -1428,7 +1440,7 @@ main(int argc, char **argv)

 #ifdef	SESSION

 	/* FIXME: add localSocket support to watchdog */

-	if(localSocket == NULL)

+	if((localSocket == NULL) || external)

 #endif

 		pthread_create(&tid, NULL, watchdog, NULL);

@@ -1439,26 +1451,49 @@ main(int argc, char **argv)

 	if(pidfile) {

 		/* save the PID */

+		char *p, *q;

 		FILE *fd;

 		const mode_t old_umask = umask(0006);

+		if(pidfile[0] != '/') {

+			if(use_syslog)

+				syslog(LOG_ERR, _("pidfile: '%s' must be a full pathname"),

+					pidfile);

+			cli_errmsg(_("pidfile '%s' must be a full pathname\n"), pidfile);

+

+			return EX_CONFIG;

+		}

+		p = strdup(pidfile);

+		q = strrchr(p, '/');

+		*q = '\0';

+

+		if(chdir(p) < 0)	/* safety */

+			perror(p);

+		free(p);

+

 		if((fd = fopen(pidfile, "w")) == NULL) {

 			if(use_syslog)

 				syslog(LOG_ERR, _("Can't save PID in file %s"),

 					pidfile);

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

 			return EX_CONFIG;

-		} else {

+		}

 #ifdef	C_LINUX

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

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

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

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

 #else

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

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

 #endif

-			fclose(fd);

-		}

+		fclose(fd);

 		umask(old_umask);

-	}

+	} else if(tmpdir)

+		chdir(tmpdir);	/* safety */

+	else

+#ifdef	P_tmpdir

+		chdir(P_tmpdir);

+#else

+		chdir("/tmp");

+#endif

 	if(cfgopt(copt, "FixStaleSocket")) {

 		/*

@@ -1490,14 +1525,14 @@ main(int argc, char **argv)

 	}

 #if	0

-	/* Only supported by later libmilter */

+	/* Only supported by Sendmail >= V8.13 */

 	if(smfi_opensocket(1) == MI_FAILURE) {

 		cli_errmsg("can't open/create %s\n", port);

 		return EX_CONFIG;

 	}

 #endif

-	signal(SIGPIPE, SIG_IGN);

+	signal(SIGPIPE, SIG_IGN);	/* libmilter probably does this as well */

 #ifdef	SESSION

 	pthread_mutex_lock(&version_mutex);

@@ -1918,6 +1953,13 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 	pthread_mutex_unlock(&accept_mutex);

 	if(!accepting) {

 		cli_warnmsg("Not accepting inputs at the moment\n");

+		/*

+		 * We must refuse here even if dont_wait isn't set, since

+		 * it could take some time, and sendmail could time us out

+		 * and refuse to have anything more to do with us until

+		 * the program is restarted

+		 */

+#if	0

 		if(dont_wait)

 			return SMFIS_TEMPFAIL;

 		pthread_mutex_lock(&accept_mutex);

@@ -1925,6 +1967,8 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 			pthread_cond_wait(&accept_cond, &accept_mutex);

 		pthread_mutex_unlock(&accept_mutex);

 		cli_warnmsg("Accepting inputs again\n");

+#endif

+		return SMFIS_TEMPFAIL;

 	}

 	if(ctx == NULL) {

@@ -2425,6 +2469,9 @@ clamfi_body(SMFICTX *ctx, u_char *bodyp, size_t len)

 	cli_dbgmsg(_("clamfi_envbody: %u bytes\n"), len);

 #endif

+	if(len == 0)	/* unlikely */

+		return SMFIS_CONTINUE;

+

 	nbytes = clamfi_send(privdata, len, (char *)bodyp);

 	if(streamMaxLength > 0L) {

 		if(privdata->numBytes > streamMaxLength) {

@@ -2618,8 +2665,8 @@ clamfi_eom(SMFICTX *ctx)

 #endif

 			/*

 			 * TODO: if more than one host has been specified, try

-			 * another one - setting cl_error to SMFIS_TEMPFAIL helps

-			 * by forcing a retry

+			 * another one - setting cl_error to SMFIS_TEMPFAIL

+			 * helps by forcing a retry

 			 */

 			clamfi_cleanup(ctx);

 			syslog(LOG_NOTICE, _("clamfi_eom: read nothing from clamd on %s"), hostname);

@@ -2962,10 +3009,7 @@ clamfi_eom(SMFICTX *ctx)

 					syslog(LOG_ERR, _("Can't set quarantine user %s"), quarantine);

 				else

 					cli_warnmsg(_("Can't set quarantine user %s\n"), quarantine);

-				if(privdata->discard)

-					rc = SMFIS_DISCARD;

-				else

-					rc = SMFIS_REJECT;

+				rc = (privdata->discard) ? SMFIS_DISCARD : SMFIS_REJECT;

 			} else {

 				if(use_syslog)

 					syslog(LOG_DEBUG, "Redirected virus to %s", quarantine);

@@ -5038,7 +5082,7 @@ logger(const char *mess)

 #else

 		ctime_r(&currtime, buf);

 #endif

-		fprintf(fout, "%.*s -> %s\n", strlen(buf) - 1, buf, mess);

+		fprintf(fout, "%.*s -> %s\n", (int)strlen(buf) - 1, buf, mess);

 #else	/*!HAVE_CTIME_R*/

 		/* TODO */

 		fprintf(fout, "%s\n", mess);

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

 msgstr ""

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

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

-"POT-Creation-Date: 2005-04-18 11:53+0100\n"

+"POT-Creation-Date: 2005-05-04 20:14+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"

@@ -279,444 +279,454 @@ msgstr ""

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

 msgstr ""

-#: clamav-milter.c:1045

+#: clamav-milter.c:1050

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1055

+#: clamav-milter.c:1060

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1059

+#: clamav-milter.c:1064

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1072

+#: clamav-milter.c:1077

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1082

+#: clamav-milter.c:1087

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1084

+#: clamav-milter.c:1089

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1094 clamav-milter.c:1117

+#: clamav-milter.c:1099 clamav-milter.c:1122

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1096 clamav-milter.c:1119

+#: clamav-milter.c:1101 clamav-milter.c:1124

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1130

+#: clamav-milter.c:1135

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1147

+#: clamav-milter.c:1152

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1162

+#: clamav-milter.c:1167

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1181 clamav-milter.c:1266

+#: clamav-milter.c:1186 clamav-milter.c:1271

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1204

+#: clamav-milter.c:1209

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1216

+#: clamav-milter.c:1221

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1233

+#: clamav-milter.c:1238

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

 msgstr ""

-#: clamav-milter.c:1234 clamav-milter.c:1240

+#: clamav-milter.c:1239 clamav-milter.c:1245

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1239

+#: clamav-milter.c:1244

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

 msgstr ""

-#: clamav-milter.c:1246

+#: clamav-milter.c:1251

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1314

+#: clamav-milter.c:1319

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1315

+#: clamav-milter.c:1320

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

 msgstr ""

-#: clamav-milter.c:1376

+#: clamav-milter.c:1388

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1438

+#: clamav-milter.c:1450

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1447

+#: clamav-milter.c:1460

+#, c-format

+msgid "pidfile: '%s' must be a full pathname"

+msgstr ""

+

+#: clamav-milter.c:1462

+#, c-format

+msgid "pidfile '%s' must be a full pathname\n"

+msgstr ""

+

+#: clamav-milter.c:1476

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1449

+#: clamav-milter.c:1478

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1506

+#: clamav-milter.c:1541

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1509

+#: clamav-milter.c:1544

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1576 clamav-milter.c:1835

+#: clamav-milter.c:1611 clamav-milter.c:1870

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1581

+#: clamav-milter.c:1616

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:1756

+#: clamav-milter.c:1791

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:1838

+#: clamav-milter.c:1873

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1844

+#: clamav-milter.c:1879

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

 msgstr ""

-#: clamav-milter.c:1880

+#: clamav-milter.c:1915

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:1889

+#: clamav-milter.c:1924

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:1894

+#: clamav-milter.c:1929

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

 msgstr ""

-#: clamav-milter.c:1896

+#: clamav-milter.c:1931

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:1932

+#: clamav-milter.c:1976

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:1937

+#: clamav-milter.c:1981

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:1958

+#: clamav-milter.c:2002

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:1967

+#: clamav-milter.c:2011

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:1968

+#: clamav-milter.c:2012

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:1971

+#: clamav-milter.c:2015

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1972

+#: clamav-milter.c:2016

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1992

+#: clamav-milter.c:2036

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2001

+#: clamav-milter.c:2045

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2010

+#: clamav-milter.c:2054

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2021

+#: clamav-milter.c:2065

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2038

+#: clamav-milter.c:2082

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2056

+#: clamav-milter.c:2100

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2057

+#: clamav-milter.c:2101

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2065

+#: clamav-milter.c:2109

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2066

+#: clamav-milter.c:2110

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2080

+#: clamav-milter.c:2124

 msgid "clamfi_connect: gethostname failed"

 msgstr ""

-#: clamav-milter.c:2085

+#: clamav-milter.c:2129

 msgid "Rejected email falsely claiming to be from here"

 msgstr ""

-#: clamav-milter.c:2086

+#: clamav-milter.c:2130

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

 msgstr ""

-#: clamav-milter.c:2087 clamav-milter.c:2371

+#: clamav-milter.c:2131 clamav-milter.c:2415

 msgid "Forged local address detected"

 msgstr ""

-#: clamav-milter.c:2115

+#: clamav-milter.c:2159

 msgid "Rejected email with empty from field"

 msgstr ""

-#: clamav-milter.c:2116

+#: clamav-milter.c:2160

 msgid "You have not said who the email is from"

 msgstr ""

-#: clamav-milter.c:2117

+#: clamav-milter.c:2161

 msgid "Reject email with empty from field"

 msgstr ""

-#: clamav-milter.c:2139

+#: clamav-milter.c:2183

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2140

+#: clamav-milter.c:2184

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2146

+#: clamav-milter.c:2190

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2147

+#: clamav-milter.c:2191

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2152

+#: clamav-milter.c:2196

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2185

+#: clamav-milter.c:2229

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2191

+#: clamav-milter.c:2235

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2193

+#: clamav-milter.c:2237

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

 msgstr ""

-#: clamav-milter.c:2336

+#: clamav-milter.c:2380

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2339

+#: clamav-milter.c:2383

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2363

+#: clamav-milter.c:2407

 msgid "clamfi_eoh: gethostname failed"

 msgstr ""

-#: clamav-milter.c:2369

+#: clamav-milter.c:2413

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2370

+#: clamav-milter.c:2414

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

 msgstr ""

-#: clamav-milter.c:2407

+#: clamav-milter.c:2451

 msgid "clamfi_eoh: ignoring whitelisted message"

 msgstr ""

-#: clamav-milter.c:2409

+#: clamav-milter.c:2453

 msgid "clamfi_eoh: ignoring whitelisted message\n"

 msgstr ""

-#: clamav-milter.c:2423

+#: clamav-milter.c:2467

 #, c-format

 msgid "clamfi_envbody: %u bytes"

 msgstr ""

-#: clamav-milter.c:2425

+#: clamav-milter.c:2469

 #, c-format

 msgid "clamfi_envbody: %u bytes\n"

 msgstr ""

-#: clamav-milter.c:2435 clamav-milter.c:2729

+#: clamav-milter.c:2482 clamav-milter.c:2776

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2439 clamav-milter.c:2732

+#: clamav-milter.c:2486 clamav-milter.c:2779

 msgid "Not Scanned - StreamMaxLength exceeded"

 msgstr ""

-#: clamav-milter.c:2492

+#: clamav-milter.c:2539

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2555

+#: clamav-milter.c:2602

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2577

+#: clamav-milter.c:2624

 msgid "failed to send SCAN command to clamd"

 msgstr ""

-#: clamav-milter.c:2594

+#: clamav-milter.c:2641

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2607

+#: clamav-milter.c:2654

 #, c-format

 msgid "clamfi_eom: read %s"

 msgstr ""

-#: clamav-milter.c:2608

+#: clamav-milter.c:2655

 #, c-format

 msgid "clamfi_eom: read %s\n"

 msgstr ""

-#: clamav-milter.c:2625

+#: clamav-milter.c:2672

 #, c-format

 msgid "clamfi_eom: read nothing from clamd on %s"

 msgstr ""

-#: clamav-milter.c:2627

+#: clamav-milter.c:2674

 #, c-format

 msgid "clamfi_eom: read nothing from clamd on %s\n"

 msgstr ""

-#: clamav-milter.c:2672 clamav-milter.c:2718

+#: clamav-milter.c:2719 clamav-milter.c:2765

 msgid "Error determining host"

 msgstr ""

-#: clamav-milter.c:2737

+#: clamav-milter.c:2784

 msgid "Not Scanned"

 msgstr ""

-#: clamav-milter.c:2766

+#: clamav-milter.c:2813

 msgid "Infected with"

 msgstr ""

-#: clamav-milter.c:2787

+#: clamav-milter.c:2834

 #, c-format

 msgid "Intercepted virus from %s to"

 msgstr ""

-#: clamav-milter.c:2880

+#: clamav-milter.c:2927

 msgid ""

 "Subject: Virus intercepted\n"

 "\n"

 msgstr ""

-#: clamav-milter.c:2888

+#: clamav-milter.c:2935

 msgid "A message you sent to\n"

 msgstr ""

-#: clamav-milter.c:2895

+#: clamav-milter.c:2942

 #, c-format

 msgid "The message %1$s sent from %2$s to\n"

 msgstr ""

-#: clamav-milter.c:2898

+#: clamav-milter.c:2945

 #, c-format

 msgid "A message sent from %s to\n"

 msgstr ""

-#: clamav-milter.c:2903

+#: clamav-milter.c:2950

 #, c-format

 msgid "contained %s and has not been delivered.\n"

 msgstr ""

-#: clamav-milter.c:2906

+#: clamav-milter.c:2953

 #, c-format

 msgid ""

 "\n"

 "The message in question has been quarantined as %s\n"

 msgstr ""

-#: clamav-milter.c:2909

+#: clamav-milter.c:2956

 #, c-format

 msgid ""

 "\n"

@@ -724,13 +734,13 @@ msgid ""

 "\n"

 msgstr ""

-#: clamav-milter.c:2912

+#: clamav-milter.c:2959

 msgid ""

 "For your information, the original message headers were:\n"

 "\n"

 msgstr ""

-#: clamav-milter.c:2925

+#: clamav-milter.c:2972

 #, c-format

 msgid ""

 "\n"

@@ -738,240 +748,240 @@ msgid ""

 "%s\t\n"

 msgstr ""

-#: clamav-milter.c:2933

+#: clamav-milter.c:2980

 #, c-format

 msgid "Can't execute '%s' to send virus notice"

 msgstr ""

-#: clamav-milter.c:2938

+#: clamav-milter.c:2985

 #, c-format

 msgid "Quarantined infected mail as %s"

 msgstr ""

-#: clamav-milter.c:2962

+#: clamav-milter.c:3009

 #, c-format

 msgid "Can't set quarantine user %s"

 msgstr ""

-#: clamav-milter.c:2964

+#: clamav-milter.c:3011

 #, c-format

 msgid "Can't set quarantine user %s\n"

 msgstr ""

-#: clamav-milter.c:2989

+#: clamav-milter.c:3033

 #, c-format

 msgid "virus %s detected by ClamAV - http://www.clamav.net"

 msgstr ""

-#: clamav-milter.c:2994

+#: clamav-milter.c:3038

 msgid "Unknown"

 msgstr ""

-#: clamav-milter.c:2996

+#: clamav-milter.c:3040

 #, c-format

 msgid "%s: incorrect message \"%s\" from clamd"

 msgstr ""

-#: clamav-milter.c:3002

+#: clamav-milter.c:3046

 msgid "Clean"

 msgstr ""

-#: clamav-milter.c:3006

+#: clamav-milter.c:3050

 #, c-format

 msgid "%s: clean message from %s"

 msgstr ""

-#: clamav-milter.c:3008

+#: clamav-milter.c:3052

 msgid "an unknown sender"

 msgstr ""