@@ -1,3 +1,13 @@

+Tue Jan 25 08:12:51 GMT 2005 (njh)

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

+  * clamav-milter:	Internal mode is now the default. Removed --internal

+				option, added --external.

+			Don't use clamd's SESSION mode, since that causes

+				problems with clamd/freshclam when freshclam

+				is run. SESSION mode can be enabled from

+				the source code. Most people can use SESSION

+				mode safely, but it has caused problems on BSD

+

 Tue Jan 25 06:13:29 CET 2005 (tk)

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

   * freshclam/manager.c: properly count signatures in --no-dns mode (problem

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

  *

  * Change History:

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

+ * Revision 1.171  2005/01/25 08:10:45  nigelhorne

+ * Change --internal to --external

+ *

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

  * Fix --quarantine when --internal used

  *

@@ -521,9 +524,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.170 2005/01/22 13:44:09 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.171 2005/01/25 08:10:45 nigelhorne Exp $";

-#define	CM_VERSION	"0.81a"

+#define	CM_VERSION	"0.81b"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -622,9 +625,14 @@ 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

+		 *

+		 * FIXME: When SESSIONS are open, freshclam can hang when

+		 *	notfying clamd of an update. This is most likely to be a

+		 *	problem with the implementation of SESSIONS on clamd.

+		 *	The problem seems worst on BSD.

 		 */

 /*

@@ -763,8 +771,8 @@ static	int	fflag = 0;	/* force a scan, whatever */

 static	int	oflag = 0;	/* scan messages from our machine? */

 static	int	lflag = 0;	/* scan messages from our site? */

-/* Variables for --internal */

-static	int	internal = 0;	/* scan messages ourself or use clamd? */

+/* Variables for --external */

+static	int	external = 0;	/* scan messages ourself or use clamd? */

 static	struct	cl_node	*root = NULL;

 static	struct	cl_limits	limits;

 static	struct	cl_stat	dbstat;

@@ -945,11 +953,11 @@ help(void)

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

 	puts(_("\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error occurs."));

 	puts(_("\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded."));

+	puts(_("\t--external\t\t-e\tUse an external scanner (usually clamd)."));

 	puts(_("\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."));

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

 	puts(_("\t--help\t\t\t-h\tThis message."));

 	puts(_("\t--headers\t\t-H\tInclude original message headers in the report."));

-	puts(_("\t--internal\t\t-I\tUse the internal scanner."));

 	puts(_("\t--local\t\t\t-l\tScan messages sent from machines on our LAN."));

 	puts(_("\t--max-childen\t\t-m\tMaximum number of concurrent scans."));

 	puts(_("\t--outgoing\t\t-o\tScan outgoing messages from this machine."));

@@ -1026,9 +1034,9 @@ main(int argc, char **argv)

 	for(;;) {

 		int opt_index = 0;

 #ifdef	CL_DEBUG

-		const char *args = "a:AbB:c:CDfF:lm:nNop:PqQ:dhHs:St:T:U:Vx:";

+		const char *args = "a:AbB:c:CDefF:lm:nNop:PqQ:dhHs:St:T:U:Vx:";

 #else

-		const char *args = "a:AbB:c:CDfF:lm:nNop:PqQ:dhHs:St:T:U:V";

+		const char *args = "a:AbB:c:CDefF:lm:nNop:PqQ:dhHs:St:T:U:V";

 #endif

 		static struct option long_options[] = {

@@ -1060,6 +1068,9 @@ main(int argc, char **argv)

 				"debug", 0, NULL, 'D'

 			},

 			{

+				"external", 0, NULL, 'e'

+			},

+			{

 				"force-scan", 0, NULL, 'f'

 			},

 			{

@@ -1072,9 +1083,6 @@ main(int argc, char **argv)

 				"pidfile", 1, NULL, 'i'

 			},

 			{

-				"internal-scanner", 0, NULL, 'I'

-			},

-			{

 				"local", 0, NULL, 'l'

 			},

 			{

@@ -1171,6 +1179,9 @@ main(int argc, char **argv)

 			case 'D':	/* enable debug messages */

 				cl_debug();

 				break;

+			case 'e':	/* use clamd */

+				external++;

+				break;

 			case 'f':	/* force the scan */

 				fflag++;

 				break;

@@ -1183,11 +1194,6 @@ main(int argc, char **argv)

 			case 'i':	/* pidfile */

 				pidfile = optarg;

 				break;

-			case 'I':	/* use clamav-milter's internal scanner */

-				/* FIXME: error if --servers is given */

-				/* TODO: support freshclam's daemon notify */

-				internal++;

-				break;

 			case 'l':	/* scan mail from the lan */

 				lflag++;

 				break;

@@ -1218,10 +1224,12 @@ main(int argc, char **argv)

 				smfilter.xxfi_flags |= SMFIF_CHGHDRS|SMFIF_ADDRCPT|SMFIF_DELRCPT;

 				break;

 			case 's':	/* server running clamd */

-				if(internal) {

-					fputs("--internal is not compatible with --server\n", stderr);

+#ifdef	notdef	/* don't define - forces --external to be listed first :-( */

+				if(!external) {

+					fputs("--server can only be used with --external\n", stderr);

 					return EX_USAGE;

 				}

+#endif

 				serverHostNames = optarg;

 				break;

 			case 'F':	/* signature file */

@@ -1254,14 +1262,17 @@ main(int argc, char **argv)

 #endif

 			default:

 #ifdef	CL_DEBUG

-				fprintf(stderr, "Usage: %s [-b] [-c FILE] [-F FILE] [--max-children=num] [-l] [-I] [-o] [-p address] [-P] [-q] [-Q USER] [-s SERVER] [-S] [-x#] [-U PATH] socket-addr\n", argv[0]);

+				fprintf(stderr, "Usage: %s [-b] [-c FILE] [-F FILE] [--max-children=num] [-e] [-l] [-o] [-p address] [-P] [-q] [-Q USER] [-s SERVER] [-S] [-x#] [-U PATH] socket-addr\n", argv[0]);

 #else

-				fprintf(stderr, "Usage: %s [-b] [-c FILE] [-F FILE] [--max-children=num] [-l] [-I] [-o] [-p address] [-P] [-q] [-Q USER] [-s SERVER] [-S] [-U PATH] socket-addr\n", argv[0]);

+				fprintf(stderr, "Usage: %s [-b] [-c FILE] [-F FILE] [--max-children=num] [-e] [-l] [-o] [-p address] [-P] [-q] [-Q USER] [-s SERVER] [-S] [-U PATH] socket-addr\n", argv[0]);

 #endif

 				return EX_USAGE;

 		}

 	}

+	/* FIXME: error if --servers and --external is not given */

+	/* TODO: support freshclam's daemon notify if --external is not given */

+

 	if (optind == argc) {

 		fprintf(stderr, _("%s: No socket-addr given\n"), argv[0]);

 		return EX_USAGE;

@@ -1471,9 +1482,9 @@ main(int argc, char **argv)

 	 * Get the outgoing socket details - the way to talk to clamd, unless

 	 * we're doing the scanning internally

 	 */

-	if(internal) {

+	if(!external) {

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

-			fprintf(stderr, _("%s: ScanMail not defined in %s (needed with --internal)\n"),

+			fprintf(stderr, _("%s: ScanMail not defined in %s (needed without --external)\n"),

 				argv[0], cfgfile);

 			return EX_CONFIG;

 		}

@@ -1675,7 +1686,7 @@ main(int argc, char **argv)

 	}

 #ifdef	SESSION

-	if(internal) {

+	if(!external) {

 		if(clamav_versions == NULL) {

 			clamav_versions = (char **)cli_malloc(sizeof(char *));

 			if(clamav_versions == NULL)

@@ -1705,7 +1716,7 @@ main(int argc, char **argv)

 	strcpy(clamav_version, version);

 #endif

-	if(((quarantine_dir == NULL) && localSocket) || internal) {

+	if(((quarantine_dir == NULL) && localSocket) || (!external)) {

 		/* set the temporary dir */

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

 			tmpdir = cpt->strarg;

@@ -1729,11 +1740,11 @@ 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"));

+#else

+		const char *logFile;

 #endif

 		switch(fork()) {

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

 	atexit(quit);

-	if(internal) {

+	if(!external) {

 		/* TODO: read the limits from clamd.conf */

 		if(cfgopt(copt, "DisableDefaultScanOptions"))

@@ -2817,12 +2828,12 @@ clamfi_eom(SMFICTX *ctx)

 	assert(privdata->dataSocket >= 0);

 #endif

-	if(!internal) {

+	if(external) {

 		close(privdata->dataSocket);

 		privdata->dataSocket = -1;

 	}

-	if(internal) {

+	if(!external) {

 		const char *virname;

 		unsigned long int scanned = 0L;

@@ -2900,7 +2911,7 @@ clamfi_eom(SMFICTX *ctx)

 		session = &sessions[privdata->serverNumber];

 #endif

-	if(!internal) {

+	if(external) {

 #ifdef	SESSION

 #ifdef	CL_DEBUG

 		if(debug_level >= 4)

@@ -2957,7 +2968,7 @@ clamfi_eom(SMFICTX *ctx)

 		/*

 		 * Include the hostname where the scan took place

 		 */

-		if(localSocket || internal) {

+		if(localSocket || !external) {

 #ifdef	MAXHOSTNAMELEN

 			char hostname[MAXHOSTNAMELEN + 1];

 #else

@@ -3460,7 +3471,7 @@ clamfi_free(struct privdata *privdata)

 			privdata->to = NULL;

 		}

-		if(!internal) {

+		if(external) {

 #ifdef	SESSION

 			session = &sessions[privdata->serverNumber];

 			pthread_mutex_lock(&sstatus_mutex);

@@ -4589,7 +4600,7 @@ watchdog(void *a)

 {

 	static pthread_mutex_t watchdog_mutex = PTHREAD_MUTEX_INITIALIZER;

-	assert(internal || (sessions != NULL));

+	assert((!external) || (sessions != NULL));

 	while(!quitting) {

 		int i;

@@ -4618,7 +4629,7 @@ watchdog(void *a)

 		cli_dbgmsg("watchdog wakes\n");

 		pthread_mutex_unlock(&watchdog_mutex);

-		if(internal) {

+		if(!external) {

 			/*

 			 * Re-load the database if the server's not busy.

 			 * TODO: If a reload is needed go into a mode when

@@ -4824,7 +4835,7 @@ quit(void)

 	pthread_mutex_unlock(&version_mutex);

 #endif

-	if(internal) {

+	if(!external) {

 		if(root) {

 			cl_free(root);

 			root = NULL;

@@ -4900,7 +4911,7 @@ loadDatabase(void)

 	const struct cfgstruct *cpt;

 	static const char *dbdir;

-	assert(internal);

+	assert(!external);

 	if(dbdir == NULL) {

 		if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory")))

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

+"POT-Creation-Date: 2005-01-25 08:08+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,635 +16,635 @@ msgstr ""

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

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

-#: clamav-milter.c:937

+#: clamav-milter.c:945

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

 msgstr ""

-#: clamav-milter.c:938

+#: clamav-milter.c:946

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

 msgstr ""

-#: clamav-milter.c:939

+#: clamav-milter.c:947

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:940

+#: clamav-milter.c:948

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

 msgstr ""

-#: clamav-milter.c:941

+#: clamav-milter.c:949

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

 msgstr ""

-#: clamav-milter.c:942

+#: clamav-milter.c:950

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:943

+#: clamav-milter.c:951

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:944

+#: clamav-milter.c:952

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

 msgstr ""

-#: clamav-milter.c:945

+#: clamav-milter.c:953

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

+msgstr ""

+

+#: clamav-milter.c:954

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

 msgstr ""

-#: clamav-milter.c:946

+#: clamav-milter.c:955

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

 msgstr ""

-#: clamav-milter.c:947

+#: clamav-milter.c:956

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

 msgstr ""

-#: clamav-milter.c:948

+#: clamav-milter.c:957

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

 msgstr ""

-#: clamav-milter.c:949

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

-msgstr ""

-

-#: clamav-milter.c:950

+#: clamav-milter.c:958

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

 msgstr ""

-#: clamav-milter.c:951

+#: clamav-milter.c:959

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

 msgstr ""

-#: clamav-milter.c:952

+#: clamav-milter.c:960

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

 msgstr ""

-#: clamav-milter.c:953

+#: clamav-milter.c:961

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

 msgstr ""

-#: clamav-milter.c:954

+#: clamav-milter.c:962

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

 msgstr ""

-#: clamav-milter.c:955

+#: clamav-milter.c:963

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

 msgstr ""

-#: clamav-milter.c:956

+#: clamav-milter.c:964

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

 msgstr ""

-#: clamav-milter.c:957

+#: clamav-milter.c:965

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

 msgstr ""

-#: clamav-milter.c:958

+#: clamav-milter.c:966

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

 msgstr ""

-#: clamav-milter.c:959

+#: clamav-milter.c:967

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

 msgstr ""

-#: clamav-milter.c:960

+#: clamav-milter.c:968

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

 msgstr ""

-#: clamav-milter.c:961

+#: clamav-milter.c:969

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:962

+#: clamav-milter.c:970

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

 msgstr ""

-#: clamav-milter.c:963

+#: clamav-milter.c:971

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

 msgstr ""

-#: clamav-milter.c:964

+#: clamav-milter.c:972

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

 msgstr ""

-#: clamav-milter.c:965

+#: clamav-milter.c:973

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

 msgstr ""

-#: clamav-milter.c:966

+#: clamav-milter.c:974

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

 msgstr ""

-#: clamav-milter.c:968

+#: clamav-milter.c:976

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

 msgstr ""

-#: clamav-milter.c:970

+#: clamav-milter.c:978

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:971

+#: clamav-milter.c:979

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

 msgstr ""

-#: clamav-milter.c:1263

+#: clamav-milter.c:1274

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1269

+#: clamav-milter.c:1280

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1277

+#: clamav-milter.c:1288

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1316

+#: clamav-milter.c:1327

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1325

+#: clamav-milter.c:1336

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1336

+#: clamav-milter.c:1347

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1353

+#: clamav-milter.c:1364

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1356

+#: clamav-milter.c:1367

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1358

+#: clamav-milter.c:1369

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1363

+#: clamav-milter.c:1374

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1371

+#: clamav-milter.c:1382

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1377

+#: clamav-milter.c:1388

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1383

+#: clamav-milter.c:1394

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1389

+#: clamav-milter.c:1400

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1406

+#: clamav-milter.c:1417

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1432

+#: clamav-milter.c:1443

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1440

+#: clamav-milter.c:1451

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1463

+#: clamav-milter.c:1474

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1473

+#: clamav-milter.c:1484

 #, c-format

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

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

 msgstr ""

-#: clamav-milter.c:1478

+#: clamav-milter.c:1489

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1482

+#: clamav-milter.c:1493

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1495

+#: clamav-milter.c:1506

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1505

+#: clamav-milter.c:1516

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1507

+#: clamav-milter.c:1518

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1528 clamav-milter.c:1551

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1530 clamav-milter.c:1553

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1553

+#: clamav-milter.c:1564

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1570

+#: clamav-milter.c:1581

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1585

+#: clamav-milter.c:1596

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1615 clamav-milter.c:1698

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1627

+#: clamav-milter.c:1638

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1639

+#: clamav-milter.c:1650

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1656

+#: clamav-milter.c:1667

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

 msgstr ""

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

+#: clamav-milter.c:1668 clamav-milter.c:1674

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1662

+#: clamav-milter.c:1673

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

 msgstr ""

-#: clamav-milter.c:1669

+#: clamav-milter.c:1680

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1732

+#: clamav-milter.c:1741

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1733

+#: clamav-milter.c:1742

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

 msgstr ""

-#: clamav-milter.c:1849

+#: clamav-milter.c:1860

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1858

+#: clamav-milter.c:1869

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1860

+#: clamav-milter.c:1871

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1893

+#: clamav-milter.c:1904

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1909

+#: clamav-milter.c:1920

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1912

+#: clamav-milter.c:1923

 msgid "Debugging is on"

 msgstr ""

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

+#: clamav-milter.c:1988 clamav-milter.c:2245

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1982

+#: clamav-milter.c:1993

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:2157

+#: clamav-milter.c:2168

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2237

+#: clamav-milter.c:2248

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2243

+#: clamav-milter.c:2254

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

 msgstr ""

-#: clamav-milter.c:2279

+#: clamav-milter.c:2290

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2288

+#: clamav-milter.c:2299

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2293

+#: clamav-milter.c:2304

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

 msgstr ""

-#: clamav-milter.c:2295

+#: clamav-milter.c:2306

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2316

+#: clamav-milter.c:2327

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2321

+#: clamav-milter.c:2332

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2342

+#: clamav-milter.c:2353

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2351

+#: clamav-milter.c:2362

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:2352

+#: clamav-milter.c:2363

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:2355

+#: clamav-milter.c:2366

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2356

+#: clamav-milter.c:2367

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2376

+#: clamav-milter.c:2387

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2385

+#: clamav-milter.c:2396

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2394

+#: clamav-milter.c:2405

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2405

+#: clamav-milter.c:2416

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2422

+#: clamav-milter.c:2433

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2440

+#: clamav-milter.c:2451

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2441

+#: clamav-milter.c:2452

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2449

+#: clamav-milter.c:2460

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2450

+#: clamav-milter.c:2461

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2482

+#: clamav-milter.c:2493

 #, c-format

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

 msgstr ""