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

+Sat Jan 22 13:45:42 GMT 2005 (njh)

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

+  * clamav-milter:	If forwarding to a quarantine user fails log as LOG_ERR

+				not LOG_DEBUG

+			Try to santity check that the input socket name is the

+				same as the same given to sendmail

+			Redirect stdout and stderr to LogFile, if that is set

+			--quarantine didn't redirect to the given email address

+				if --internal was used (reported by N Fung

+				<nsfung@yahoo.com>)

+

 Thu Jan 20 01:22:48 CET 2005 (tk)

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

   V 0.81rc1

@@ -9,7 +20,7 @@ Thu Jan 20 01:07:26 CET 2005 (tk)

 Wed Jan 19 17:46:19 GMT 2005 (njh)

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

   * libclamav/mbox.c:	Changed fullline warning. The debug message is no

-  		longer needed to gather data, since the code seems to be working

+		longer needed to gather data, since the code seems to be working

 Wed Jan 19 05:32:10 GMT 2005 (njh)

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

@@ -17,7 +28,7 @@ Wed Jan 19 05:32:10 GMT 2005 (njh)

   * libclamav/text.c:	Added textIterate to simplify some functions

   * libclamav/blob.c:	Better handling of empty data

   * libclamav/binhex.c:	Cleaner handling of empty files which shouldn't go to

-  		cli_binhex()

+		cli_binhex()

 Wed Jan 19 00:58:40 CET 2005 (tk)

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

@@ -641,6 +641,14 @@ Changes

 0.80gg	12/1/05:	Fixed DNS resolution error messages which could print

 		the incorrect hostname that is not being resolved

 0.81	19/1/05:	Up issued

+0.81a	22/1/05:	If forwarding to a quarantine user fails log as LOG_ERR

+				not LOG_DEBUG

+			Try to santity check that the input socket name is the

+				same as the same given to sendmail

+			Redirect stdout and stderr to LogFile, if that is set

+			--quarantine didn't redirect to the given email address

+				if --internal was used (reported by N Fung

+				<nsfung@yahoo.com>)

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.170  2005/01/22 13:44:09  nigelhorne

+ * Fix --quarantine when --internal used

+ *

  * Revision 1.169  2005/01/19 05:27:39  nigelhorne

  * Up issued

  *

@@ -518,9 +521,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.169 2005/01/19 05:27:39 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.170 2005/01/22 13:44:09 nigelhorne Exp $";

-#define	CM_VERSION	"0.81"

+#define	CM_VERSION	"0.81a"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -566,6 +569,14 @@ static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.169 2005/01/19 05:27:39 ni

 #include <netdb.h>

 #include <sys/param.h>

+#if HAVE_MMAP

+#if HAVE_SYS_MMAN_H

+#include <sys/mman.h>

+#else /* HAVE_SYS_MMAN_H */

+#undef HAVE_MMAP

+#endif

+#endif

+

 #ifdef	C_LINUX

 #include <sys/sendfile.h>

 #include <libintl.h>

@@ -632,8 +643,6 @@ typedef	unsigned int	in_addr_t;

  * TODO: Files can be scanned with "SCAN" not "STREAM" if clamd is on the same

  *	machine when talking via INET domain socket.

  * TODO: Load balancing, allow local machine to talk via UNIX domain socket.

- * TODO: Read the input socket name from sendmail.mc/sendmail.cf, or at least

- *	sanity check that they're the same

  */

 struct header_node_t {

@@ -920,6 +929,8 @@ static	void	print_trace(void);

 #endif

+static	int	verifyIncomingSocketName(const char *sockName);

+

 static void

 help(void)

 {

@@ -1257,6 +1268,11 @@ main(int argc, char **argv)

 	}

 	port = argv[optind];

+	if(verifyIncomingSocketName(port) < 0) {

+		fprintf(stderr, _("%s: socket-addr (%s) doesn't agree with sendmail.cf\n"), argv[0], port);

+		return EX_CONFIG;

+	}

+

 	/*

 	 * Sanity checks on the clamav configuration file

 	 */

@@ -1713,6 +1729,8 @@ main(int argc, char **argv)

 		tmpdir = NULL;

 	if(!cfgopt(copt, "Foreground")) {

+		const char *logFile;

+

 #ifdef	CL_DEBUG

 		printf(_("When debugging it is recommended that you use Foreground mode in %s\n"), cfgfile);

 		puts(_("\tso that you can see all of the messages"));

@@ -1733,8 +1751,22 @@ main(int argc, char **argv)

 #ifndef	CL_DEBUG

 		close(1);

 		close(2);

-		/* FIXME: use LogFile if that is set */

-		if((open("/dev/console", O_WRONLY) == 1) ||

+

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

+			logFile = cpt->strarg;

+

+#if	defined(MSDOS) || defined(C_CYGWIN) || defined(WIN32)

+			if((strlen(logFile) < 2) || ((logFile[0] != '/') && (logFile[0] != '\\') && (logFile[1] != ':'))) {

+#else

+			if((strlen(logFile) < 2) || (logFile[0] != '/')) {

+#endif

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

+				return EX_CONFIG;

+			}

+		} else

+			logFile = "/dev/console";

+

+		if((open(logFile, O_WRONLY) == 1) ||

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

 			dup(1);

 #endif

@@ -2798,15 +2830,17 @@ clamfi_eom(SMFICTX *ctx)

 		 * TODO: consider using cl_scandesc and not using a temporary

 		 *	file from the mail being read in

 		 */

-		rc = cl_scanfile(privdata->filename, &virname, &scanned, root,

-			&limits, options);

-

-		if(rc == CL_CLEAN)

-			strcpy(mess, "OK");

-		else if(rc == CL_VIRUS)

-			sprintf(mess, "%s: %s FOUND", privdata->filename, virname);

-		else

-			sprintf(mess, "%s: %s ERROR", privdata->filename, cl_strerror(rc));

+		switch(cl_scanfile(privdata->filename, &virname, &scanned, root, &limits, options)) {

+			case CL_CLEAN:

+				strcpy(mess, "OK");

+				break;

+			case CL_VIRUS:

+				sprintf(mess, "%s: %s FOUND", privdata->filename, virname);

+				break;

+			default:

+				sprintf(mess, "%s: %s ERROR", privdata->filename, cl_strerror(rc));

+				break;

+		}

 #ifdef	SESSION

 		session = NULL;

@@ -3237,11 +3271,19 @@ clamfi_eom(SMFICTX *ctx)

 			 */

 			if(smfi_addrcpt(ctx, quarantine) == MI_FAILURE) {

 				if(use_syslog)

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

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

 				else

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

-			} else

+				if(privdata->discard)

+					rc = SMFIS_DISCARD;

+				else

+					rc = SMFIS_REJECT;

+			} else {

+				if(use_syslog)

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

+				cli_dbgmsg("Redirected virus to %s\n", quarantine);

 				setsubject(ctx, virusname);

+			}

 		} else if(advisory)

 			setsubject(ctx, virusname);

 		else if(rejectmail) {

@@ -3252,6 +3294,10 @@ clamfi_eom(SMFICTX *ctx)

 		} else

 			rc = SMFIS_DISCARD;

+		/*

+		 * Don't drop the message if it's been forwarded to a

+		 * quarantine email

+		 */

 		snprintf(reject, sizeof(reject) - 1, _("virus %s detected by ClamAV - http://www.clamav.net"), virusname);

 		smfi_setreply(ctx, (char *)privdata->rejectCode, "5.7.1", reject);

 		broadcast(mess);

@@ -4978,3 +5024,57 @@ print_trace(void)

 	free(strings);

 }

 #endif

+

+/*

+ * Check that the correct port name has been given, i.e. that the

+ * input socket to clamav-milter from sendmail, is the same that

+ * sendmail has been configured to use as it's output socket

+ * Return:	<0 invalid

+ *		=0 valid

+ *		>0 unknown

+ */

+static int

+verifyIncomingSocketName(const char *sockName)

+{

+#if HAVE_MMAP

+	int fd, ret;

+	char *ptr;

+	size_t size;

+	struct stat statb;

+

+	fd = open("/etc/mail/sendmail.cf", O_RDONLY);

+

+	if(fd < 0)

+		fd = open("/etc/sendmail.cf", O_RDONLY);

+	if(fd < 0)

+		return 1;

+

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

+		close(fd);

+		return 1;

+	}

+

+	size = statb.st_size;

+

+	if(size == 0) {

+		close(fd);

+		return -1;

+	}

+

+	ptr = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);

+	if(ptr == MAP_FAILED) {

+		perror("mmap");

+		close(fd);

+		return -1;

+	}

+

+	ret = (cli_memstr(ptr, size, sockName, strlen(sockName)) != NULL) ? 1 : -1;

+

+	munmap(ptr, size);

+	close(fd);

+

+	return ret;

+#else	/*!HAVE_MMAP*/

+	return 1;

+#endif

+}

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

 msgstr ""

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

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

-"POT-Creation-Date: 2005-01-19 05:15+0000\n"

+"POT-Creation-Date: 2005-01-22 13:43+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,630 +16,635 @@ msgstr ""

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

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

-#: clamav-milter.c:926

+#: clamav-milter.c:937

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

 msgstr ""

-#: clamav-milter.c:927

+#: clamav-milter.c:938

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

 msgstr ""

-#: clamav-milter.c:928

+#: clamav-milter.c:939

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:929

+#: clamav-milter.c:940

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

 msgstr ""

-#: clamav-milter.c:930

+#: clamav-milter.c:941

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

 msgstr ""

-#: clamav-milter.c:931

+#: clamav-milter.c:942

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:932

+#: clamav-milter.c:943

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:933

+#: clamav-milter.c:944

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

 msgstr ""

-#: clamav-milter.c:934

+#: clamav-milter.c:945

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

 msgstr ""

-#: clamav-milter.c:935

+#: clamav-milter.c:946

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

 msgstr ""

-#: clamav-milter.c:936

+#: clamav-milter.c:947

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

 msgstr ""

-#: clamav-milter.c:937

+#: clamav-milter.c:948

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

 msgstr ""

-#: clamav-milter.c:938

+#: clamav-milter.c:949

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

 msgstr ""

-#: clamav-milter.c:939

+#: clamav-milter.c:950

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

 msgstr ""

-#: clamav-milter.c:940

+#: clamav-milter.c:951

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

 msgstr ""

-#: clamav-milter.c:941

+#: clamav-milter.c:952

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

 msgstr ""

-#: clamav-milter.c:942

+#: clamav-milter.c:953

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

 msgstr ""

-#: clamav-milter.c:943

+#: clamav-milter.c:954

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

 msgstr ""

-#: clamav-milter.c:944

+#: clamav-milter.c:955

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

 msgstr ""

-#: clamav-milter.c:945

+#: clamav-milter.c:956

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

 msgstr ""

-#: clamav-milter.c:946

+#: clamav-milter.c:957

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

 msgstr ""

-#: clamav-milter.c:947

+#: clamav-milter.c:958

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

 msgstr ""

-#: clamav-milter.c:948

+#: clamav-milter.c:959

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

 msgstr ""

-#: clamav-milter.c:949

+#: clamav-milter.c:960

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

 msgstr ""

-#: clamav-milter.c:950

+#: clamav-milter.c:961

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:951

+#: clamav-milter.c:962

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

 msgstr ""

-#: clamav-milter.c:952

+#: clamav-milter.c:963

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

 msgstr ""

-#: clamav-milter.c:953

+#: clamav-milter.c:964

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

 msgstr ""

-#: clamav-milter.c:954

+#: clamav-milter.c:965

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

 msgstr ""

-#: clamav-milter.c:955

+#: clamav-milter.c:966

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

 msgstr ""

-#: clamav-milter.c:957

+#: clamav-milter.c:968

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

 msgstr ""

-#: clamav-milter.c:959

+#: clamav-milter.c:970

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:960

+#: clamav-milter.c:971

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

 msgstr ""

-#: clamav-milter.c:1252

+#: clamav-milter.c:1263

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1261

+#: clamav-milter.c:1269

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1277

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1300

+#: clamav-milter.c:1316

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1309

+#: clamav-milter.c:1325

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1320

+#: clamav-milter.c:1336

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1337

+#: clamav-milter.c:1353

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1340

+#: clamav-milter.c:1356

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1342

+#: clamav-milter.c:1358

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1347

+#: clamav-milter.c:1363

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1355

+#: clamav-milter.c:1371

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1361

+#: clamav-milter.c:1377

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1367

+#: clamav-milter.c:1383

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1373

+#: clamav-milter.c:1389

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1390

+#: clamav-milter.c:1406

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1416

+#: clamav-milter.c:1432

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1424

+#: clamav-milter.c:1440

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1447

+#: clamav-milter.c:1463

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1457

+#: clamav-milter.c:1473

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1462

+#: clamav-milter.c:1478

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1466

+#: clamav-milter.c:1482

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1479

+#: clamav-milter.c:1495

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1489

+#: clamav-milter.c:1505

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1491

+#: clamav-milter.c:1507

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1501 clamav-milter.c:1524

+#: clamav-milter.c:1517 clamav-milter.c:1540

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1503 clamav-milter.c:1526

+#: clamav-milter.c:1519 clamav-milter.c:1542

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1537

+#: clamav-milter.c:1553

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1554

+#: clamav-milter.c:1570

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1569

+#: clamav-milter.c:1585

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1588 clamav-milter.c:1671

+#: clamav-milter.c:1604 clamav-milter.c:1687

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1611

+#: clamav-milter.c:1627

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1623

+#: clamav-milter.c:1639

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1640

+#: clamav-milter.c:1656

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

 msgstr ""

-#: clamav-milter.c:1641 clamav-milter.c:1647

+#: clamav-milter.c:1657 clamav-milter.c:1663

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1646

+#: clamav-milter.c:1662

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

 msgstr ""

-#: clamav-milter.c:1653

+#: clamav-milter.c:1669

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1714

+#: clamav-milter.c:1732

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1715

+#: clamav-milter.c:1733

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

 msgstr ""

-#: clamav-milter.c:1817

+#: clamav-milter.c:1849

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1826

+#: clamav-milter.c:1858

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1828

+#: clamav-milter.c:1860

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1861

+#: clamav-milter.c:1893

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1877

+#: clamav-milter.c:1909

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1880

+#: clamav-milter.c:1912

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1945 clamav-milter.c:2202

+#: clamav-milter.c:1977 clamav-milter.c:2234

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1950

+#: clamav-milter.c:1982

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:2125

+#: clamav-milter.c:2157

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2205

+#: clamav-milter.c:2237

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2211

+#: clamav-milter.c:2243

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

 msgstr ""

-#: clamav-milter.c:2247

+#: clamav-milter.c:2279

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2256

+#: clamav-milter.c:2288

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2261

+#: clamav-milter.c:2293

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

 msgstr ""

-#: clamav-milter.c:2263

+#: clamav-milter.c:2295

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2284

+#: clamav-milter.c:2316

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2289

+#: clamav-milter.c:2321

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2310

+#: clamav-milter.c:2342

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2319

+#: clamav-milter.c:2351

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:2320

+#: clamav-milter.c:2352

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:2323

+#: clamav-milter.c:2355

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2324

+#: clamav-milter.c:2356

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2344

+#: clamav-milter.c:2376

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2353

+#: clamav-milter.c:2385

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2362

+#: clamav-milter.c:2394

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2373

+#: clamav-milter.c:2405

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2390

+#: clamav-milter.c:2422

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2408

+#: clamav-milter.c:2440

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2409

+#: clamav-milter.c:2441

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2417

+#: clamav-milter.c:2449

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2418

+#: clamav-milter.c:2450

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2450

+#: clamav-milter.c:2482

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2451

+#: clamav-milter.c:2483

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2457

+#: clamav-milter.c:2489

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2458

+#: clamav-milter.c:2490

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2463

+#: clamav-milter.c:2495

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2496

+#: clamav-milter.c:2528

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""