@@ -1,3 +1,11 @@

+Sun Sep 12 15:25:12 BST 2004 (njh)

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

+  * clamav-milter:	Use .../share/clamav/clamav-milter/locale for the locale

+				information

+			Added first draft of SESSION code. Do NOT use in a

+				production environment. It is disabled by

+				default.

+

 Wed Sep  8 21:47:09 BST 2004 (njh)

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

   * contrib/init/RedHat:	Start clamav before sendmail and shut it down

@@ -486,6 +486,10 @@ Changes

 		Added i18n support

 		Better error message if the quarantine directory is publically

 			accessable

+0.75o	12/9/04	Use .../share/clamav/clamav-milter/locale for the locale

+			information

+		Added first draft of SESSION code. Do NOT use in a production

+			environment.

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.123  2004/09/12 14:23:47  nigelhorne

+ * Added SESSION Code

+ *

  * Revision 1.122  2004/09/08 16:03:36  nigelhorne

  * i18n

  *

@@ -377,9 +380,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.122 2004/09/08 16:03:36 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.123 2004/09/12 14:23:47 nigelhorne Exp $";

-#define	CM_VERSION	"0.75n"

+#define	CM_VERSION	"0.75o"

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

@@ -462,6 +465,12 @@ int	deny_severity = LOG_NOTICE;

 typedef	unsigned short	in_port_t;

 #endif

+/* Do not define SESSION - it puts clamd/acceptloop_th() into a loop */

+/*#define	SESSION	/*

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

+		 * command connection is created for each new email

+		 */

+

 /*

  * TODO: optional: xmessage on console when virus stopped (SNMP would be real nice!)

  *	Having said that, with LogSysLog you can (on Linux) configure the system

@@ -519,10 +528,12 @@ struct	privdata {

 	char	*from;	/* Who sent the message */

 	char	**to;	/* Who is the message going to */

 	int	numTo;	/* Number of people the message is going to */

+#ifndef	SESSION

 	int	cmdSocket;	/*

 				 * Socket to send/get commands e.g. PORT for

 				 * dataSocket

 				 */

+#endif

 	int	dataSocket;	/* Socket to send data to clamd */

 	char	*filename;	/* Where to store the message in quarantine */

 	u_char	*body;		/* body of the message if Sflag is set */

@@ -664,9 +675,14 @@ static	struct	cfgstruct	*copt;

 static	const	char	*localSocket;	/* milter->clamd comms */

 static	in_port_t	tcpSocket;	/* milter->clamd comms */

 static	char	*port = NULL;	/* sendmail->milter comms */

+

 static	const	char	*serverHostNames = "127.0.0.1";

 static	long	*serverIPs;	/* IPv4 only */

-static	int	numServers;	/* numer of elements in serverIPs */

+#ifdef	SESSION

+static	int	*cmdSockets;

+#endif	/*SESSION*/

+static	int	numServers;	/* number of elements in serverIPs/cmdSockets */

+

 static	const	char	*postmaster = "postmaster";

 static	const	char	*from = "MAILER-DAEMON";

@@ -726,6 +742,7 @@ int

 main(int argc, char **argv)

 {

 	extern char *optarg;

+	int i;

 	const char *cfgfile = CL_DEFAULT_CFG;

 	struct cfgstruct *cpt;

 	struct passwd *user;

@@ -763,7 +780,7 @@ main(int argc, char **argv)

 #ifdef	C_LINUX

 	setlocale(LC_ALL, "");

-	bindtextdomain("clamav-milter", "locale");

+	bindtextdomain("clamav-milter", DATADIR"/clamav-milter/locale");

 	textdomain("clamav-milter");

 #endif

@@ -1143,7 +1160,7 @@ main(int argc, char **argv)

 		serverIPs = (long *)cli_malloc(sizeof(long));

 		serverIPs[0] = inet_addr("127.0.0.1");

 	} else if((cpt = cfgopt(copt, "TCPSocket")) != NULL) {

-		int i, activeServers;

+		int activeServers;

 		/*

 		 * TCPSocket is in fact a port number not a full socket

@@ -1210,6 +1227,73 @@ main(int argc, char **argv)

 		return EX_CONFIG;

 	}

+#ifdef	SESSION

+	if(localSocket) {

+		struct sockaddr_un server;

+

+		memset((char *)&server, 0, sizeof(struct sockaddr_un));

+		server.sun_family = AF_UNIX;

+		strncpy(server.sun_path, localSocket, sizeof(server.sun_path));

+

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

+		if((cmdSockets[0] = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {

+			perror(localSocket);

+			return EX_UNAVAILABLE;

+		}

+		if(connect(cmdSockets[0], (struct sockaddr *)&server, sizeof(struct sockaddr_un)) < 0) {

+			perror(localSocket);

+			return EX_UNAVAILABLE;

+		}

+		if(send(cmdSockets[0], "SESSION\n", 7, 0) < 7) {

+			perror("send");

+			if(use_syslog)

+				syslog(LOG_ERR, _("Can't create a clamd session"));

+			return EX_UNAVAILABLE;

+		}

+	} else {

+		/*

+		 * FIXME: Sessions code doesn't allow more than one datastream

+		 * at a time to a server

+		 */

+		if(max_children > numServers) {

+			fprintf(stderr, _("%s: Sessions does not multiplex\n"), argv[0]);

+			return EX_CONFIG;

+		}

+

+		cmdSockets = (int *)cli_malloc(numServers * sizeof(int));

+

+		assert(serverIPs != NULL);

+

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

+			struct sockaddr_in server;

+

+			memset((char *)&server, 0, sizeof(struct sockaddr_in));

+			server.sin_family = AF_INET;

+			server.sin_port = (in_port_t)htons(tcpSocket);

+

+			server.sin_addr.s_addr = serverIPs[i];

+

+			if((cmdSockets[i] = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

+				perror("socket");

+				return EX_UNAVAILABLE;

+			}

+			if(connect(cmdSockets[i], (struct sockaddr *)&server, sizeof(struct sockaddr_in)) < 0) {

+				perror("connect");

+				return EX_UNAVAILABLE;

+			}

+			if(send(cmdSockets[i], "SESSION\n", 7, 0) < 7) {

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

+				perror("send");

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

+				free(hostname);

+

+				close(cmdSockets[i]);

+				cmdSockets[i] = -1;

+			}

+		}

+	}

+#endif

+

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

 #ifdef	CL_DEBUG

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

@@ -1349,7 +1433,7 @@ pingServer(int serverNumber)

 		strncpy(server.sun_path, localSocket, sizeof(server.sun_path));

 		if((sock = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {

-			perror("socket");

+			perror(localSocket);

 			return 0;

 		}

 		checkClamd();

@@ -1424,7 +1508,7 @@ pingServer(int serverNumber)

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

 	 */

 	snprintf(clamav_version, sizeof(clamav_version),

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

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

 		buf, CM_VERSION);

 	return 1;

@@ -1473,6 +1557,16 @@ findServer(void)

 	for(i = 0, server = servers; i < numServers; i++, server++) {

 		int sock;

+#ifdef	SESSION

+		/*

+		 * FIXME: Sessions code isn't flexible at handling servers

+		 *	appearing and disappearing

+		 * FIXME: ensure we don't try scanning with a server that's

+		 *	already scanning

+		 */

+		if(cmdSockets[i] == -1)

+			continue;

+#endif

 		server->sin_family = AF_INET;

 		server->sin_port = (in_port_t)htons(tcpSocket);

 		server->sin_addr.s_addr = serverIPs[(i + j) % numServers];

@@ -1821,7 +1915,9 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 		return cl_error;

 	privdata->dataSocket = -1;	/* 0.4 */

+#ifndef	SESSION

 	privdata->cmdSocket = -1;	/* 0.4 */

+#endif

 	/*

 	 * Rejection is via 550 until DATA is received. We know that

@@ -2060,8 +2156,10 @@ clamfi_eom(SMFICTX *ctx)

 #ifdef	CL_DEBUG

 	cli_dbgmsg("clamfi_eom\n");

 	assert(privdata != NULL);

+#ifndef	SESSION

 	assert((privdata->cmdSocket >= 0) || (privdata->filename != NULL));

 	assert(!((privdata->cmdSocket >= 0) && (privdata->filename != NULL)));

+#endif

 	assert(privdata->dataSocket >= 0);

 #endif

@@ -2082,6 +2180,19 @@ clamfi_eom(SMFICTX *ctx)

 		server.sun_family = AF_UNIX;

 		strncpy(server.sun_path, localSocket, sizeof(server.sun_path));

+		snprintf(cmdbuf, sizeof(cmdbuf) - 1, "SCAN %s", privdata->filename);

+

+		nbytes = (int)strlen(cmdbuf);

+

+#ifdef	SESSION

+		if(send(cmdSockets[0], cmdbuf, nbytes, 0) < nbytes) {

+			perror("send");

+			clamfi_cleanup(ctx);

+			if(use_syslog)

+				syslog(LOG_ERR, _("send failed to clamd"));

+			return cl_error;

+		}

+#else

 		if((privdata->cmdSocket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {

 			perror("socket");

 			clamfi_cleanup(ctx);

@@ -2092,11 +2203,6 @@ clamfi_eom(SMFICTX *ctx)

 			clamfi_cleanup(ctx);

 			return cl_error;

 		}

-

-		snprintf(cmdbuf, sizeof(cmdbuf) - 1, "SCAN %s", privdata->filename);

-

-		nbytes = (int)strlen(cmdbuf);

-

 		if(send(privdata->cmdSocket, cmdbuf, nbytes, 0) < nbytes) {

 			perror("send");

 			clamfi_cleanup(ctx);

@@ -2106,9 +2212,14 @@ clamfi_eom(SMFICTX *ctx)

 		}

 		shutdown(privdata->cmdSocket, SHUT_WR);

+#endif

 	}

+#ifdef	SESSION

+	if(clamd_recv(cmdSockets[privdata->serverNumber], mess, sizeof(mess)) > 0) {

+#else

 	if(clamd_recv(privdata->cmdSocket, mess, sizeof(mess)) > 0) {

+#endif

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

 			*ptr = '\0';

@@ -2129,8 +2240,10 @@ clamfi_eom(SMFICTX *ctx)

 		return cl_error;

 	}

+#ifndef	SESSION

 	close(privdata->cmdSocket);

 	privdata->cmdSocket = -1;

+#endif

 	sendmailId = smfi_getsymval(ctx, "i");

 	if(sendmailId == NULL)

@@ -2579,17 +2692,30 @@ clamfi_free(struct privdata *privdata)

 			privdata->to = NULL;

 		}

+#ifdef	SESSION

+		if(readTimeout && (cmdSockets[privdata->serverNumber] >= 0)) for(;;) {

+			char buf[64];

+

+			cli_dbgmsg("clamfi_free: Flush cmd server %d (fd %d)\n",

+				privdata->serverNumber, cmdSockets[privdata->serverNumber]);

+

+			while(clamd_recv(cmdSockets[privdata->serverNumber], buf, sizeof(buf)) > 0)

+				puts(buf);

+		}

+#else

 		if(privdata->cmdSocket >= 0) {

 			char buf[64];

 			/*

 			 * Flush the remote end so that clamd doesn't get a SIGPIPE

 			 */

-			while(clamd_recv(privdata->cmdSocket, buf, sizeof(buf)) > 0)

-				;

+			if(readTimeout)

+				while(clamd_recv(privdata->cmdSocket, buf, sizeof(buf)) > 0)

+					;

 			close(privdata->cmdSocket);

 			privdata->cmdSocket = -1;

 		}

+#endif

 		if(privdata->headers)

 			header_list_free(privdata->headers);

@@ -2744,6 +2870,8 @@ clamd_recv(int sock, char *buf, size_t len)

 	fd_set rfds;

 	struct timeval tv;

+	assert(sock >= 0);

+

 	if(readTimeout == 0)

 		return recv(sock, buf, len, 0);

@@ -2953,20 +3081,23 @@ connect2clamd(struct privdata *privdata)

 				syslog(LOG_ERR, _("Temporary quarantine file %s creation failed"), privdata->filename);

 			return 0;

 		}

-		privdata->serverNumber = -1;

+		privdata->serverNumber = 0;

 	} else {

 		int freeServer, nbytes;

 		struct sockaddr_in reply;

 		unsigned short p;

 		char buf[64];

+#ifndef	SESSION

 		assert(privdata->cmdSocket == -1);

+#endif

 		/*

 		 * Create socket to talk to clamd. It will tell us the port to

 		 * use to send the data. That will require another socket.

 		 */

 		if(localSocket) {

+#ifndef	SESSION

 			struct sockaddr_un server;

 			memset((char *)&server, 0, sizeof(struct sockaddr_un));

@@ -2981,9 +3112,15 @@ connect2clamd(struct privdata *privdata)

 				perror(localSocket);

 				return 0;

 			}

+			privdata->serverNumber = 0;

+#endif

 			freeServer = 0;

-			privdata->serverNumber = -1;

 		} else {

+#ifdef	SESSION

+			freeServer = findServer();

+			if(freeServer < 0)

+				return 0;

+#else

 			struct sockaddr_in server;

 			memset((char *)&server, 0, sizeof(struct sockaddr_in));

@@ -3006,31 +3143,46 @@ connect2clamd(struct privdata *privdata)

 				perror("connect");

 				return 0;

 			}

+#endif

 			privdata->serverNumber = freeServer;

 		}

-		/*

-		 * Create socket that we'll use to send the data to clamd

-		 */

-		if((privdata->dataSocket = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

-			perror("socket");

+#ifdef	SESSION

+		if(send(cmdSockets[freeServer], "STREAM\n", 7, 0) < 7) {

+			cli_dbgmsg("Sending stream to server %d (fd %d)\n",

+				freeServer, cmdSockets[freeServer]);

+			perror("send");

 			if(use_syslog)

-				syslog(LOG_ERR, _("failed to create socket"));

+				syslog(LOG_ERR, _("send failed to clamd"));

 			return 0;

 		}

-

-		shutdown(privdata->dataSocket, SHUT_RD);

-

+#else

 		if(send(privdata->cmdSocket, "STREAM\n", 7, 0) < 7) {

 			perror("send");

 			if(use_syslog)

 				syslog(LOG_ERR, _("send failed to clamd"));

 			return 0;

 		}

-

 		shutdown(privdata->cmdSocket, SHUT_WR);

+#endif

+

+		/*

+		 * Create socket that we'll use to send the data to clamd

+		 */

+		if((privdata->dataSocket = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

+			perror("socket");

+			if(use_syslog)

+				syslog(LOG_ERR, _("failed to create TCPSocket to talk to clamd"));

+			return 0;

+		}

+		shutdown(privdata->dataSocket, SHUT_RD);

+

+#ifdef	SESSION

+		nbytes = clamd_recv(cmdSockets[privdata->serverNumber], buf, sizeof(buf));

+#else

 		nbytes = clamd_recv(privdata->cmdSocket, buf, sizeof(buf));

+#endif

 		if(nbytes < 0) {

 			perror("recv");

 			if(use_syslog)

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

 msgstr ""

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

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

-"POT-Creation-Date: 2004-09-08 17:03+0100\n"

+"POT-Creation-Date: 2004-09-12 15:11+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,537 +16,547 @@ msgstr ""

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

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

-#: clamav-milter.c:688

+#: clamav-milter.c:704

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

 msgstr ""

-#: clamav-milter.c:689

+#: clamav-milter.c:705

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

 msgstr ""

-#: clamav-milter.c:690

+#: clamav-milter.c:706

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

 msgstr ""

-#: clamav-milter.c:691

+#: clamav-milter.c:707

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

 msgstr ""

-#: clamav-milter.c:692

+#: clamav-milter.c:708

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:693

+#: clamav-milter.c:709

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:694

+#: clamav-milter.c:710

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

 msgstr ""

-#: clamav-milter.c:695

+#: clamav-milter.c:711

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

 msgstr ""

-#: clamav-milter.c:696

+#: clamav-milter.c:712

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

 msgstr ""

-#: clamav-milter.c:697

+#: clamav-milter.c:713

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

 msgstr ""

-#: clamav-milter.c:698

+#: clamav-milter.c:714

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

 msgstr ""

-#: clamav-milter.c:699

+#: clamav-milter.c:715

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

 msgstr ""

-#: clamav-milter.c:700

+#: clamav-milter.c:716

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

 msgstr ""

-#: clamav-milter.c:701

+#: clamav-milter.c:717

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

 msgstr ""

-#: clamav-milter.c:702

+#: clamav-milter.c:718

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

 msgstr ""

-#: clamav-milter.c:703

+#: clamav-milter.c:719

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

 msgstr ""

-#: clamav-milter.c:704

+#: clamav-milter.c:720

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

 msgstr ""

-#: clamav-milter.c:705

+#: clamav-milter.c:721

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

 msgstr ""

-#: clamav-milter.c:706

+#: clamav-milter.c:722

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

 msgstr ""

-#: clamav-milter.c:707

+#: clamav-milter.c:723

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

 msgstr ""

-#: clamav-milter.c:708

+#: clamav-milter.c:724

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

 msgstr ""

-#: clamav-milter.c:709

+#: clamav-milter.c:725

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:710

+#: clamav-milter.c:726

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

 msgstr ""

-#: clamav-milter.c:711

+#: clamav-milter.c:727

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

 msgstr ""

-#: clamav-milter.c:712

+#: clamav-milter.c:728

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

 msgstr ""

-#: clamav-milter.c:713

+#: clamav-milter.c:729

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

 msgstr ""

-#: clamav-milter.c:714

+#: clamav-milter.c:730

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

 msgstr ""

-#: clamav-milter.c:716

+#: clamav-milter.c:732

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

 msgstr ""

-#: clamav-milter.c:718

+#: clamav-milter.c:734

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:719

+#: clamav-milter.c:735

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

 msgstr ""

-#: clamav-milter.c:983

+#: clamav-milter.c:1000

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:992

+#: clamav-milter.c:1009

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1003

+#: clamav-milter.c:1020

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1014

+#: clamav-milter.c:1031

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1031

+#: clamav-milter.c:1048

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1034

+#: clamav-milter.c:1051

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1037

+#: clamav-milter.c:1054

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1044

+#: clamav-milter.c:1061

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1060

+#: clamav-milter.c:1077

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1075

+#: clamav-milter.c:1092

 #, c-format

 msgid "%s: StreamSavetoDisk not enabled in %s\n"

 msgstr ""

-#: clamav-milter.c:1085

+#: clamav-milter.c:1102

 #, c-format

 msgid "%s: ScanMail not enabled in %s\n"

 msgstr ""

-#: clamav-milter.c:1102

+#: clamav-milter.c:1119

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1109

+#: clamav-milter.c:1126

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1120

+#: clamav-milter.c:1137

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1129

+#: clamav-milter.c:1146

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1131

+#: clamav-milter.c:1148

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1149

+#: clamav-milter.c:1166

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1182

+#: clamav-milter.c:1199

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1193

+#: clamav-milter.c:1210

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1199

+#: clamav-milter.c:1216

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

 msgstr ""

-#: clamav-milter.c:1200

+#: clamav-milter.c:1217

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1205

+#: clamav-milter.c:1222

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1212

+#: clamav-milter.c:1247

+msgid "Can't create a clamd session"

+msgstr ""

+

+#: clamav-milter.c:1256

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1284 clamav-milter.c:1589

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1296

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1213

+#: clamav-milter.c:1297

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

 msgstr ""

-#: clamav-milter.c:1259

+#: clamav-milter.c:1343

 #, c-format

 msgid "Starting: %s"

 msgstr ""

-#: clamav-milter.c:1264

+#: clamav-milter.c:1348

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1268

+#: clamav-milter.c:1352

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1280

+#: clamav-milter.c:1364

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1282

+#: clamav-milter.c:1366

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1310

+#: clamav-milter.c:1394

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1323

+#: clamav-milter.c:1407

 #, c-format

 msgid "Started: %s"

 msgstr ""

-#: clamav-milter.c:1495

-#, c-format

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

-msgstr ""

-

-#: clamav-milter.c:1498

+#: clamav-milter.c:1592

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1636 clamav-milter.c:1693

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

 msgstr ""

-#: clamav-milter.c:1544 clamav-milter.c:1601

+#: clamav-milter.c:1638 clamav-milter.c:1695

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:1562

+#: clamav-milter.c:1656

 msgid "Subject: ClamAV Down\n"

 msgstr ""

-#: clamav-milter.c:1565

+#: clamav-milter.c:1659

 msgid ""

 "This is an automatic message\n"

 "\n"

 msgstr ""

-#: clamav-milter.c:1568

+#: clamav-milter.c:1662

 msgid "The clamd program cannot be contacted.\n"

 msgstr ""

-#: clamav-milter.c:1570

+#: clamav-milter.c:1664

 msgid "No clamd server can be contacted.\n"

 msgstr ""

-#: clamav-milter.c:1572

+#: clamav-milter.c:1666

 msgid "Emails may not be being scanned, please check your servers.\n"

 msgstr ""

-#: clamav-milter.c:1585

+#: clamav-milter.c:1679

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:1594

+#: clamav-milter.c:1688

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:1618

+#: clamav-milter.c:1712

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:1623

+#: clamav-milter.c:1717

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:1644

+#: clamav-milter.c:1738

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:1652

+#: clamav-milter.c:1746

 #, c-format