@@ -1,3 +1,15 @@

+Wed Oct 27 13:36:14 BST 2004 (njh)

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

+  * clamav-milter:	Remove X-VIRUS-STATUS on incoming messages

+			Plug remote possibility of file descriptor leak

+			Return EX_OSERR if fork fails, not EX_TEMPFAIL

+			If clamav-milter points to more than one server, ensure

+				that the version information for that server is

+				added to the header

+			Update version information in the watchdog. There may

+				therefore be a delay between the server updating

+				and this being reflected in the headers

+

 Wed Oct 27 09:30:47 BST 2004 (trog)

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

   * libclamav/htmlnorm.c: extract more HTML references from use with FOLLOWURL

@@ -525,6 +525,16 @@ Changes

 			bind failure message

 		SESSION code now on by default

 		Use cli_strtokbuf() instead of cli_strtok() whereever possible

+0.80l	27/10/04 Remove X-VIRUS-STATUS on incoming messages since there's no

+			way to verify it's statement about being clean

+		Plug remote possibility of file descriptor leak

+		Return EX_OSERR if fork fails, not EX_TEMPFAIL

+		If clamav-milter points to more than one server, ensure that

+			the version information for that server is added to

+			the header

+		Update version information in the watchdog. There may therefore

+			be a delay between the server updating and this being

+			reflected in the headers

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.143  2004/10/27 12:34:21  nigelhorne

+ * Correct version header

+ *

  * Revision 1.142  2004/10/24 03:49:47  nigelhorne

  * Enable SESSION code by default

  *

@@ -437,9 +440,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.142 2004/10/24 03:49:47 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.143 2004/10/27 12:34:21 nigelhorne Exp $";

-#define	CM_VERSION	"0.80k"

+#define	CM_VERSION	"0.80l"

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

@@ -529,6 +532,8 @@ typedef	unsigned short	in_port_t;

 typedef	unsigned int	in_addr_t;

 #endif

+#define	VERSION_LENGTH	128

+

 #define	SESSION	/*

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

 		 * command connection is created for each new email

@@ -652,7 +657,12 @@ static	int	logg_facility(const char *name);

 static	void	quit(void);

 static	void	broadcast(const char *mess);

-static	char	clamav_version[128];

+#ifdef	SESSION

+static	char	**clamav_versions;

+#define	clamav_version	(clamav_versions[0])

+#else

+static	char	clamav_version[VERSION_LENGTH + 1];

+#endif

 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? */

@@ -838,6 +848,7 @@ main(int argc, char **argv)

 	struct cfgstruct *cpt;

 	struct passwd *user;

 	const char *pidfile = NULL;

+	char version[VERSION_LENGTH + 1];

 #ifdef	SESSION

 	pthread_t tid;

 #endif

@@ -865,10 +876,10 @@ main(int argc, char **argv)

 		perror("setrlimit");

 #endif

 	/*

-	 * Temporarily enter guessed value into clamav_version, will

+	 * Temporarily enter guessed value into version, will

 	 * be overwritten later by the value returned by clamd

 	 */

-	snprintf(clamav_version, sizeof(clamav_version),

+	snprintf(version, sizeof(version) - 1,

 		"ClamAV version %s, clamav-milter version %s",

 		VERSION, CM_VERSION);

@@ -1086,7 +1097,7 @@ main(int argc, char **argv)

 				quarantine_dir = optarg;

 				break;

 			case 'V':

-				puts(clamav_version);

+				puts(version);

 				return EX_OK;

 			case 'w':

 				dont_wait++;

@@ -1281,9 +1292,9 @@ main(int argc, char **argv)

 			sockname = &port[6];

 		if(sockname && (strcmp(sockname, cpt->strarg) == 0)) {

-		   	fprintf(stderr, _("The connection from sendmail to %s (%s) must not\n"),

+			fprintf(stderr, _("The connection from sendmail to %s (%s) must not\n"),

 				argv[0], sockname);

-		   	fprintf(stderr, _("be the same as the connection to clamd (%s) in %s\n"),

+			fprintf(stderr, _("be the same as the connection to clamd (%s) in %s\n"),

 				cpt->strarg, cfgfile);

 			return EX_CONFIG;

 		}

@@ -1425,6 +1436,16 @@ main(int argc, char **argv)

 		}

 #ifdef	SESSION

 		activeServers = numServers;

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

+		if(clamav_versions == NULL)

+			return EX_TEMPFAIL;

+

+		for(i = 0; i < numServers; i++) {

+			clamav_versions[i] = strdup(version);

+			if(clamav_versions[i] == NULL)

+				return EX_TEMPFAIL;

+		}

+

 		cmdSockets = (int *)cli_malloc(max_children * sizeof(int));

 		cmdSocketsStatus = (int *)cli_calloc(max_children, sizeof(int));

 		for(i = 0; i < max_children; i++)

@@ -1453,7 +1474,7 @@ main(int argc, char **argv)

 		switch(fork()) {

 			case -1:

 				perror("fork");

-				return EX_TEMPFAIL;

+				return EX_OSERR;

 			case 0:	/* child */

 				break;

 			default:	/* parent */

@@ -1617,6 +1638,9 @@ createSession(int session)

 		char *hostname = cli_strtok(serverHostNames, serverNumber, ":");

 #endif

+		if(cmdSockets[session] >= 0)

+			close(cmdSockets[session]);

+

 		cli_warnmsg(_("Check clamd server %s - it may be down\n"), hostname);

 #ifndef	MAXHOSTNAMELEN

 		free(hostname);

@@ -1626,7 +1650,7 @@ createSession(int session)

 		cmdSocketsStatus[session] = CMDSOCKET_DOWN;

 	}

-	cli_dbgmsg("cmdSockets[%d] = %d\n", session, cmdSockets[session]);

+

 	return ret;

 }

@@ -1728,7 +1752,7 @@ pingServer(int serverNumber)

 	 *	if they're running different versions, or if the virus DBs

 	 *	are out of date (say more than a month old)

 	 */

-	snprintf(clamav_version, sizeof(clamav_version),

+	snprintf(clamav_version, sizeof(clamav_version) - 1,

 		"%s\n\tclamav-milter version %s",

 		buf, CM_VERSION);

@@ -2230,6 +2254,12 @@ clamfi_header(SMFICTX *ctx, char *headerf, char *headerv)

 		return cl_error;

 	}

+	if(strcasecmp(headerf, "X-Virus-Status") == 0)

+		if(!nflag) {	/* remove any existing claims */

+			smfi_chgheader(ctx, "X-Virus-Status", 1, NULL);

+			return SMFIS_CONTINUE;

+		}

+

 	if(hflag)

 		header_list_add(privdata->headers, headerf, headerv);

 	else if((strcasecmp(headerf, "Received") == 0) &&

@@ -2494,7 +2524,11 @@ clamfi_eom(SMFICTX *ctx)

 		 * Include the hostname where the scan took place

 		 */

 		if(localSocket) {

-			char hostname[32];

+#ifdef	MAXHOSTNAMELEN

+			char hostname[MAXHOSTNAMELEN + 1];

+#else

+			char hostname[65];

+#endif

 			if(gethostname(hostname, sizeof(hostname)) < 0) {

 				const char *j = smfi_getsymval(ctx, "{j}");

@@ -2514,8 +2548,13 @@ clamfi_eom(SMFICTX *ctx)

 					strncpy(hostname, hostent.h_name, sizeof(hostname));

 			}

-			snprintf(buf, sizeof(buf) - 1, "%s\n\ton %s",

+#ifdef	SESSION

+			snprintf(buf, sizeof(buf) - 1, "%s on %s",

+				clamav_versions[privdata->serverNumber], hostname);

+#else

+			snprintf(buf, sizeof(buf) - 1, "%s on %s",

 				clamav_version, hostname);

+#endif

 		} else {

 #ifdef	MAXHOSTNAMELEN

 			char hostname[MAXHOSTNAMELEN + 1];

@@ -2526,9 +2565,13 @@ clamfi_eom(SMFICTX *ctx)

 			if(hostname) {

 #endif

-				snprintf(buf, sizeof(buf) - 1, "%s\n\ton %s",

-					clamav_version,

-					hostname);

+#ifdef	SESSION

+				snprintf(buf, sizeof(buf) - 1, "%s on %s",

+					clamav_versions[privdata->serverNumber], hostname);

+#else

+				snprintf(buf, sizeof(buf) - 1, "%s on %s",

+					clamav_version, hostname);

+#endif

 #ifndef	MAXHOSTNAMELEN

 				free(hostname);

 #endif

@@ -3911,6 +3954,9 @@ clamdIsDown(void)

  * Thread to monitor the links to clamd sessions. Any marked as being in

  * an error state because of previous I/O errors are restarted, and a heartbeat

  * is sent the others

+ *

+ * It is woken up when the milter goes idle, when there are no free servers

+ * available and once every readTimeout-1 seconds

  */

 static void *

 watchdog(void *a)

@@ -3925,14 +3971,7 @@ watchdog(void *a)

 		struct timeval tp;

 		gettimeofday(&tp, NULL);

-		/*

-		 * How often (in seconds) to try to fix broken clamd sessions.

-		 * We may try more often than this e.g. when we're idle or all

-		 * connections are down, so you can put this figure quite high.

-		 * But can't be too high because with older clamd SESSION

-		 * didn't remain open if no data goes down for ReadTimeout

-		 * seconds

-		 */

+

 		ts.tv_sec = tp.tv_sec + readTimeout - 1;

 		ts.tv_nsec = tp.tv_usec * 1000;

 		cli_dbgmsg("watchdog sleeps\n");

@@ -3966,15 +4005,29 @@ watchdog(void *a)

 			 */

 			cli_dbgmsg("watchdog: check server %d\n", i);

 			if((n_children == 0) && (cmdSocketsStatus[i] == CMDSOCKET_FREE)) {

-				if(send(sock, "PING\n", 5, 0) == 5) {

-					char buf[6];

+				if(send(sock, "VERSION\n", 8, 0) == 8) {

+					char buf[81];

+					const int nbytes = clamd_recv(sock, buf, sizeof(buf) - 1);

-					buf[5] = '\0';

-					if(clamd_recv(sock, buf, 5) != 5)

-						cmdSocketsStatus[i] = CMDSOCKET_DOWN;

-					else if(strcmp(buf, "PONG\n") != 0) {

-						cli_dbgmsg("watchdog: expected \"PONG\", got \"%s\"\n", buf);

+					if(nbytes <= 0)

 						cmdSocketsStatus[i] = CMDSOCKET_DOWN;

+					else {

+						buf[nbytes] = '\0';

+						if(strncmp(buf, "ClamAV ", 7) == 0) {

+							/* Remove the trailing new line from the reply */

+							char *ptr;

+							if((ptr = strchr(buf, '\n')) != NULL)

+								*ptr = '\0';

+							if(strcmp(buf, clamav_versions[i]) != 0) {

+								if(use_syslog)

+									syslog(LOG_INFO, "New version received for server %d: '%s'\n", i, buf);

+								free(clamav_versions[i]);

+								clamav_versions[i] = strdup(buf);

+							}

+						} else {

+							cli_warnmsg("watchdog: expected \"ClamAV\", got \"%s\"\n", buf);

+							cmdSocketsStatus[i] = CMDSOCKET_DOWN;

+						}

 					}

 				} else {

 					perror("send");

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

 msgstr ""

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

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

-"POT-Creation-Date: 2004-10-24 04:42+0100\n"

+"POT-Creation-Date: 2004-10-27 13:33+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"

@@ -16,577 +16,577 @@ msgstr ""

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

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

-#: clamav-milter.c:793

+#: clamav-milter.c:803

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

 msgstr ""

-#: clamav-milter.c:794

+#: clamav-milter.c:804

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

 msgstr ""

-#: clamav-milter.c:795

+#: clamav-milter.c:805

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:796

+#: clamav-milter.c:806

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

 msgstr ""

-#: clamav-milter.c:797

+#: clamav-milter.c:807

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

 msgstr ""

-#: clamav-milter.c:798

+#: clamav-milter.c:808

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:799

+#: clamav-milter.c:809

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:800

+#: clamav-milter.c:810

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

 msgstr ""

-#: clamav-milter.c:801

+#: clamav-milter.c:811

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

 msgstr ""

-#: clamav-milter.c:802

+#: clamav-milter.c:812

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

 msgstr ""

-#: clamav-milter.c:803

+#: clamav-milter.c:813

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

 msgstr ""

-#: clamav-milter.c:804

+#: clamav-milter.c:814

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

 msgstr ""

-#: clamav-milter.c:805

+#: clamav-milter.c:815

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

 msgstr ""

-#: clamav-milter.c:806

+#: clamav-milter.c:816

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

 msgstr ""

-#: clamav-milter.c:807

+#: clamav-milter.c:817

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

 msgstr ""

-#: clamav-milter.c:808

+#: clamav-milter.c:818

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

 msgstr ""

-#: clamav-milter.c:809

+#: clamav-milter.c:819

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

 msgstr ""

-#: clamav-milter.c:810

+#: clamav-milter.c:820

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

 msgstr ""

-#: clamav-milter.c:811

+#: clamav-milter.c:821

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

 msgstr ""

-#: clamav-milter.c:812

+#: clamav-milter.c:822

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

 msgstr ""

-#: clamav-milter.c:813

+#: clamav-milter.c:823

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

 msgstr ""

-#: clamav-milter.c:814

+#: clamav-milter.c:824

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

 msgstr ""

-#: clamav-milter.c:815

+#: clamav-milter.c:825

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

 msgstr ""

-#: clamav-milter.c:816

+#: clamav-milter.c:826

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:817

+#: clamav-milter.c:827

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

 msgstr ""

-#: clamav-milter.c:818

+#: clamav-milter.c:828

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

 msgstr ""

-#: clamav-milter.c:819

+#: clamav-milter.c:829

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

 msgstr ""

-#: clamav-milter.c:820

+#: clamav-milter.c:830

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

 msgstr ""

-#: clamav-milter.c:821

+#: clamav-milter.c:831

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

 msgstr ""

-#: clamav-milter.c:823

+#: clamav-milter.c:833

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

 msgstr ""

-#: clamav-milter.c:825

+#: clamav-milter.c:835

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:826

+#: clamav-milter.c:836

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

 msgstr ""

-#: clamav-milter.c:1107

+#: clamav-milter.c:1118

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1116

+#: clamav-milter.c:1127

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1155

+#: clamav-milter.c:1166

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1161

+#: clamav-milter.c:1172

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1172

+#: clamav-milter.c:1183

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1189

+#: clamav-milter.c:1200

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1192

+#: clamav-milter.c:1203

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1194

+#: clamav-milter.c:1205

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1199

+#: clamav-milter.c:1210

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1206

+#: clamav-milter.c:1217

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1222

+#: clamav-milter.c:1233

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1248

+#: clamav-milter.c:1259

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1255

+#: clamav-milter.c:1266

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1271

+#: clamav-milter.c:1282

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1281

+#: clamav-milter.c:1292

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1283

+#: clamav-milter.c:1294

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1293 clamav-milter.c:1316

+#: clamav-milter.c:1304 clamav-milter.c:1327

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1295 clamav-milter.c:1318

+#: clamav-milter.c:1306 clamav-milter.c:1329

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1329

+#: clamav-milter.c:1340

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1345

+#: clamav-milter.c:1356

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1360

+#: clamav-milter.c:1371

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1379

+#: clamav-milter.c:1390

 #, c-format

 msgid "%s: Sessions does not multiplex\n"

 msgstr ""

-#: clamav-milter.c:1402

+#: clamav-milter.c:1413

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1414

+#: clamav-milter.c:1425

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1432

+#: clamav-milter.c:1453

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

 msgstr ""

-#: clamav-milter.c:1433

+#: clamav-milter.c:1454

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1439

+#: clamav-milter.c:1460

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1446

+#: clamav-milter.c:1467

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1447

+#: clamav-milter.c:1468

 msgid "So that you can see all of the messages"

 msgstr ""

-#: clamav-milter.c:1508

+#: clamav-milter.c:1529

 #, c-format

 msgid "Starting: %s"

 msgstr ""

-#: clamav-milter.c:1513

+#: clamav-milter.c:1534

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1517

+#: clamav-milter.c:1538

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1521

+#: clamav-milter.c:1542

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1530

+#: clamav-milter.c:1551

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1532

+#: clamav-milter.c:1553

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1560

+#: clamav-milter.c:1581

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1573

+#: clamav-milter.c:1594

 #, c-format

 msgid "Started: %s"

 msgstr ""

-#: clamav-milter.c:1617 clamav-milter.c:1857

+#: clamav-milter.c:1641 clamav-milter.c:1881

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1622 clamav-milter.c:1866

+#: clamav-milter.c:1646 clamav-milter.c:1890

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

 msgstr ""

-#: clamav-milter.c:1783

+#: clamav-milter.c:1807

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:1860

+#: clamav-milter.c:1884

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1902

+#: clamav-milter.c:1926

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:1911

+#: clamav-milter.c:1935

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:1916

+#: clamav-milter.c:1940

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

 msgstr ""

-#: clamav-milter.c:1918

+#: clamav-milter.c:1942

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:1939

+#: clamav-milter.c:1963

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:1944

+#: clamav-milter.c:1968

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:1965

+#: clamav-milter.c:1989

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:1973

+#: clamav-milter.c:1997

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1974

+#: clamav-milter.c:1998

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1993

+#: clamav-milter.c:2017

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:1998

+#: clamav-milter.c:2022

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2008

+#: clamav-milter.c:2032

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2025

+#: clamav-milter.c:2049

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2043

+#: clamav-milter.c:2067

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2044

+#: clamav-milter.c:2068

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2052

+#: clamav-milter.c:2076

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2053

+#: clamav-milter.c:2077

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2087

+#: clamav-milter.c:2111

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2088

+#: clamav-milter.c:2112

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2094

+#: clamav-milter.c:2118

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2095

+#: clamav-milter.c:2119

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2100

+#: clamav-milter.c:2124

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2130

+#: clamav-milter.c:2154

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2136

+#: clamav-milter.c:2160

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2138

+#: clamav-milter.c:2162

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

 msgstr ""

-#: clamav-milter.c:2258

+#: clamav-milter.c:2288

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2261

+#: clamav-milter.c:2291

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2318

+#: clamav-milter.c:2348

 msgid "clamfi_eoh: ignoring whitelisted message"

 msgstr ""

-#: clamav-milter.c:2320

+#: clamav-milter.c:2350

 msgid "clamfi_eoh: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2334

+#: clamav-milter.c:2364

 #, c-format

 msgid "clamfi_envbody: %u bytes"

 msgstr ""

-#: clamav-milter.c:2336

+#: clamav-milter.c:2366

 #, c-format

 msgid "clamfi_envbody: %u bytes\n"

 msgstr ""