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

+Thu Mar 10 08:48:54 GMT 2005 (njh)

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

+  * clamav-milter:	--detect-forged-local-address no longer gives false

+				positives on emails which have the Sender

+				header set (e.g. mailing lists)

+			Use {mail_addr} if no From field is received

+

 Mon Mar  7 11:24:43 GMT 2005 (njh)

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

   * libclamav:		Added fast track visa system which reduces memory

@@ -710,6 +710,11 @@ Changes

 0.84a	5/3/05:		Note that when the connection to sendmail is via TCP/IP

 				rather than a UNIX domain socket, that --local

 				must be given

+0.84b	9/3/05:		Got rid of that GOTO

+			--detect-forged-local-address no longer gives false

+				positives on emails which have the Sender

+				header set (e.g. mailing lists)

+			Use {mail_addr} if no From field is received

 INTERNATIONALISATION

@@ -24,9 +24,9 @@

  *

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

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.187 2005/03/05 11:06:03 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.188 2005/03/10 08:46:30 nigelhorne Exp $";

-#define	CM_VERSION	"0.84a"

+#define	CM_VERSION	"0.84b"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -134,6 +134,9 @@ typedef	unsigned int	in_addr_t;

 		 *	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.

+		 *

+		 * Note that clamd is buggy and can hang or even crash if you

+		 *	send SESSION command so be aware

 		 */

 /*

@@ -194,9 +197,11 @@ static const struct cidr_net {

  */

 struct	privdata {

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

+	char	*subject;	/* Original subject */

+	char	*sender;	/* Secretary - often used in mailing lists */

+	char	*helo;		/* The HELO string */

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

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

-	char	*subject;	/* Original subject */

 #ifndef	SESSION

 	int	cmdSocket;	/*

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

@@ -227,6 +232,9 @@ static	int		pingServer(int serverNumber);

 #endif

 static	int		findServer(void);

 static	sfsistat	clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr);

+#ifdef	CL_DEBUG

+static	sfsistat	clamfi_helo(SMFICTX *ctx, char *helostring);

+#endif

 static	sfsistat	clamfi_envfrom(SMFICTX *ctx, char **argv);

 static	sfsistat	clamfi_envrcpt(SMFICTX *ctx, char **argv);

 static	sfsistat	clamfi_header(SMFICTX *ctx, char *headerf, char *headerv);

@@ -245,6 +253,7 @@ static	void	header_list_free(header_list_t list);

 static	void	header_list_add(header_list_t list, const char *headerf, const char *headerv);

 static	void	header_list_print(header_list_t list, FILE *fp);

 static	int	connect2clamd(struct privdata *privdata);

+static	int	sendToFrom(struct privdata *privdata);

 static	void	checkClamd(void);

 static	int	sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *virusname);

 static	int	qfile(struct privdata *privdata, const char *sendmailId, const char *virusname);

@@ -500,7 +509,11 @@ main(int argc, char **argv)

 		SMFI_VERSION,	/* version code -- leave untouched */

 		SMFIF_ADDHDRS|SMFIF_CHGHDRS,	/* flags - we add and deleted headers */

 		clamfi_connect, /* connection callback */

-		NULL, /* HELO filter callback */

+#ifdef	CL_DEBUG

+		clamfi_helo,	/* HELO filter callback */

+#else

+		NULL,

+#endif

 		clamfi_envfrom, /* envelope sender filter callback */

 		clamfi_envrcpt, /* envelope recipient filter callback */

 		clamfi_header, /* header filter callback */

@@ -2066,12 +2079,29 @@ static sfsistat

 clamfi_envfrom(SMFICTX *ctx, char **argv)

 {

 	struct privdata *privdata;

+	const char *mailaddr = argv[0];

 	if(logVerbose)

 		syslog(LOG_DEBUG, "clamfi_envfrom: %s", argv[0]);

 	cli_dbgmsg("clamfi_envfrom: %s\n", argv[0]);

+	if(strcmp(argv[0], "<>") == 0) {

+		mailaddr = smfi_getsymval(ctx, "{mail_addr}");

+		if(mailaddr)

+			cli_dbgmsg("Message from %s has no from value\n", mailaddr);

+		else {

+#if	0

+			if(use_syslog)

+				syslog(LOG_NOTICE, _("Rejected email with empty from field"));

+			smfi_setreply(ctx, "554", "5.7.1", _("You have not said who the email is from"));

+			broadcast(_("Reject email with empty from field"));

+			clamfi_cleanup(ctx);

+			return SMFIS_REJECT;

+#endif

+		}

+	}

+

 	if(max_children > 0) {

 		int rc = 0;

@@ -2160,30 +2190,11 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 	 */

 	privdata->rejectCode = "550";

-	privdata->from = strdup(argv[0]);

+	privdata->from = strdup(mailaddr);

 	if(hflag)

 		privdata->headers = header_list_new();

-	if(detect_forged_local_address && !isWhitelisted(argv[0])) {

-		char me[MAXHOSTNAMELEN + 1];

-		const char *ptr;

-

-		if(gethostname(me, sizeof(me) - 1) < 0) {

-			if(use_syslog)

-				syslog(LOG_WARNING, _("clamfi_connect: gethostname failed"));

-			return SMFIS_CONTINUE;

-		}

-		ptr = strstr(argv[0], me);

-		if(ptr && (ptr != argv[0]) && (*--ptr == '@')) {

-			if(use_syslog)

-				syslog(LOG_NOTICE, _("Rejected email falsely claiming to be from %s"), argv[0]);

-			smfi_setreply(ctx, "550", "5.7.1", _("You have claimed to be from me, but you are not"));

-			broadcast(_("Forged local address detected"));

-			clamfi_free(privdata);

-			return SMFIS_REJECT;

-		}

-	}

 	if(smfi_setpriv(ctx, privdata) == MI_SUCCESS)

 		return SMFIS_CONTINUE;

@@ -2192,6 +2203,16 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 	return cl_error;

 }

+#ifdef	CL_DEBUG

+static sfsistat

+clamfi_helo(SMFICTX *ctx, char *helostring)

+{

+	cli_dbgmsg("HELO '%s'\n", helostring);

+

+	return SMFIS_CONTINUE;

+}

+#endif

+

 static sfsistat

 clamfi_envrcpt(SMFICTX *ctx, char **argv)

 {

@@ -2271,6 +2292,13 @@ clamfi_header(SMFICTX *ctx, char *headerf, char *headerv)

 			privdata->subject = strdup(headerv);

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

 		privdata->statusCount++;

+	else if(strcasecmp(headerf, "Sender") == 0) {

+		if(privdata->sender)

+			free(privdata->sender);

+		if(headerv)

+			privdata->sender = strdup(headerv);

+	}

+		

 	return SMFIS_CONTINUE;

 }

@@ -2305,6 +2333,27 @@ clamfi_eoh(SMFICTX *ctx)

 			return cl_error;

 		}

+	if(detect_forged_local_address && privdata->from &&

+	   (!privdata->sender) && !isWhitelisted(privdata->from)) {

+		char me[MAXHOSTNAMELEN + 1];

+		const char *ptr;

+

+		if(gethostname(me, sizeof(me) - 1) < 0) {

+			if(use_syslog)

+				syslog(LOG_WARNING, _("clamfi_eoh: gethostname failed"));

+			return SMFIS_CONTINUE;

+		}

+		ptr = strstr(privdata->from, me);

+		if(ptr && (ptr != privdata->from) && (*--ptr == '@')) {

+			if(use_syslog)

+				syslog(LOG_NOTICE, _("Rejected email falsely claiming to be from %s"), privdata->from);

+			smfi_setreply(ctx, "554", "5.7.1", _("You have claimed to be from me, but you are not"));

+			broadcast(_("Forged local address detected"));

+			clamfi_cleanup(ctx);

+			return SMFIS_REJECT;

+		}

+	}

+

 	if(clamfi_send(privdata, 1, "\n") != 1) {

 		clamfi_cleanup(ctx);

 		return cl_error;

@@ -3081,6 +3130,10 @@ clamfi_free(struct privdata *privdata)

 			free(privdata->subject);

 			privdata->subject = NULL;

 		}

+		if(privdata->sender) {

+			free(privdata->sender);

+			privdata->sender = NULL;

+		}

 		if(privdata->to) {

 			char **to;

@@ -3452,10 +3505,6 @@ header_list_print(const header_list_t list, FILE *fp)

 static int

 connect2clamd(struct privdata *privdata)

 {

-	char **to;

-	char *msg;

-	int length;

-

 	assert(privdata != NULL);

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

 	assert(privdata->from != NULL);

@@ -3589,8 +3638,7 @@ connect2clamd(struct privdata *privdata)

 					free(privdata->filename);

 					privdata->filename = NULL;

 				} else

-					/* FIXME:!!!!!!!!!!!!!!!!!*/

-					goto end;

+					return sendToFrom(privdata);

 			}

 		}

 		cli_dbgmsg("connect2clamd(%d): STREAM\n", freeServer);

@@ -3722,14 +3770,26 @@ connect2clamd(struct privdata *privdata)

 		}

 	}

-#ifdef	SESSION

-end:

-#endif

-	/*

-	 * Combine the To and From into one clamfi_send to save bandwidth

-	 * when sending using TCP/IP to connect to a remote clamd, by band

-	 * width here I mean number of packets

-	 */

+	if(!sendToFrom(privdata))

+		return 0;

+

+	cli_dbgmsg("connect2clamd: serverNumber = %d\n", privdata->serverNumber);

+

+	return 1;

+}

+

+/*

+ * Combine the To and From into one clamfi_send to save bandwidth

+ * when sending using TCP/IP to connect to a remote clamd, by band

+ * width here I mean number of packets

+ */

+static int

+sendToFrom(struct privdata *privdata)

+{

+	char **to;

+	char *msg;

+	int length;

+

 	length = strlen(privdata->from) + 34;

 	for(to = privdata->to; *to; to++)

 		length += strlen(*to) + 5;

@@ -3760,8 +3820,6 @@ end:

 				return 0;

 	}

-	cli_dbgmsg("connect2clamd: serverNumber = %d\n", privdata->serverNumber);

-

 	return 1;

 }

@@ -4656,11 +4714,14 @@ quit(void)

 		if(rmdir(tmpdir) < 0)

 			perror(tmpdir);

+	broadcast(_("Stopping clamav-milter"));

+

 	if(pidfile)

 		if(unlink(pidfile) < 0)

 			perror(pidfile);

-	broadcast(_("Stopping clamav-milter"));

+	if(use_syslog)

+		closelog();

 }

 static void

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

 msgstr ""

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

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

-"POT-Creation-Date: 2005-03-05 11:04+0000\n"

+"POT-Creation-Date: 2005-03-10 08:45+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,696 +16,712 @@ msgstr ""

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

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

-#: clamav-milter.c:449

+#: clamav-milter.c:458

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

 msgstr ""

-#: clamav-milter.c:450

+#: clamav-milter.c:459

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

 msgstr ""

-#: clamav-milter.c:451

+#: clamav-milter.c:460

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:452

+#: clamav-milter.c:461

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

 msgstr ""

-#: clamav-milter.c:453

+#: clamav-milter.c:462

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

 msgstr ""

-#: clamav-milter.c:454

+#: clamav-milter.c:463

 msgid ""

 "\t--detect-forged-local-address\t-L\tReject mails that claim to be from us."

 msgstr ""

-#: clamav-milter.c:455

+#: clamav-milter.c:464

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:456

+#: clamav-milter.c:465

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:457

+#: clamav-milter.c:466

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

 msgstr ""

-#: clamav-milter.c:458

+#: clamav-milter.c:467

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

 msgstr ""

-#: clamav-milter.c:459

+#: clamav-milter.c:468

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

 msgstr ""

-#: clamav-milter.c:460

+#: clamav-milter.c:469

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

 msgstr ""

-#: clamav-milter.c:461

+#: clamav-milter.c:470

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

 msgstr ""

-#: clamav-milter.c:462

+#: clamav-milter.c:471

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

 msgstr ""

-#: clamav-milter.c:463

+#: clamav-milter.c:472

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

 msgstr ""

-#: clamav-milter.c:464

+#: clamav-milter.c:473

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

 msgstr ""

-#: clamav-milter.c:465

+#: clamav-milter.c:474

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

 msgstr ""

-#: clamav-milter.c:466

+#: clamav-milter.c:475

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

 msgstr ""

-#: clamav-milter.c:467

+#: clamav-milter.c:476

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

 msgstr ""

-#: clamav-milter.c:468

+#: clamav-milter.c:477

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

 msgstr ""

-#: clamav-milter.c:469

+#: clamav-milter.c:478

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

 msgstr ""

-#: clamav-milter.c:470

+#: clamav-milter.c:479

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

 msgstr ""

-#: clamav-milter.c:471

+#: clamav-milter.c:480

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

 msgstr ""

-#: clamav-milter.c:472

+#: clamav-milter.c:481

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

 msgstr ""

-#: clamav-milter.c:473

+#: clamav-milter.c:482

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

 msgstr ""

-#: clamav-milter.c:474

+#: clamav-milter.c:483

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:475

+#: clamav-milter.c:484

 msgid "\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify"

 msgstr ""

-#: clamav-milter.c:476

+#: clamav-milter.c:485

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

 msgstr ""

-#: clamav-milter.c:477

+#: clamav-milter.c:486

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

 msgstr ""

-#: clamav-milter.c:478

+#: clamav-milter.c:487

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

 msgstr ""

-#: clamav-milter.c:479

+#: clamav-milter.c:488

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

 msgstr ""

-#: clamav-milter.c:480

+#: clamav-milter.c:489

 msgid ""

 "\t--whitelist-file=FILE\t-W FILE\tLocation of the file of whitelisted "

 "addresses"

 msgstr ""

-#: clamav-milter.c:481

+#: clamav-milter.c:490

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

 msgstr ""

-#: clamav-milter.c:483

+#: clamav-milter.c:492

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

 msgstr ""

-#: clamav-milter.c:485

+#: clamav-milter.c:494

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:486

+#: clamav-milter.c:495

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

 msgstr ""

-#: clamav-milter.c:796

+#: clamav-milter.c:809

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:802

+#: clamav-milter.c:815

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:814

+#: clamav-milter.c:827

 #, c-format

 msgid "%s: when using inet: connection to sendmail you must enable --local\n"

 msgstr ""

-#: clamav-milter.c:822

+#: clamav-milter.c:835

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:829

+#: clamav-milter.c:842

 #, c-format

 msgid "%s: --detect-forged-local-addresses is not compatible with --outgoing\n"

 msgstr ""

-#: clamav-milter.c:833

+#: clamav-milter.c:846

 #, c-format

 msgid "%s: --detect-forged-local-addresses is not compatible with --local\n"

 msgstr ""

-#: clamav-milter.c:837

+#: clamav-milter.c:850

 #, c-format

 msgid "%s: --detect-forged-local-addresses is not compatible with --force\n"

 msgstr ""

-#: clamav-milter.c:876

+#: clamav-milter.c:889

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:885

+#: clamav-milter.c:898

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:896

+#: clamav-milter.c:909

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:913

+#: clamav-milter.c:926

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:916

+#: clamav-milter.c:929

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:918

+#: clamav-milter.c:931

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:923

+#: clamav-milter.c:936

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:931

+#: clamav-milter.c:944

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:937

+#: clamav-milter.c:950

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:943

+#: clamav-milter.c:956

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:949

+#: clamav-milter.c:962

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:966

+#: clamav-milter.c:979

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:992

+#: clamav-milter.c:1005

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1000

+#: clamav-milter.c:1013

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1023

+#: clamav-milter.c:1036

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1033

+#: clamav-milter.c:1046

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1037

+#: clamav-milter.c:1050

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1050

+#: clamav-milter.c:1063

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1060

+#: clamav-milter.c:1073

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1062

+#: clamav-milter.c:1075

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1072 clamav-milter.c:1095

+#: clamav-milter.c:1085 clamav-milter.c:1108

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1074 clamav-milter.c:1097

+#: clamav-milter.c:1087 clamav-milter.c:1110

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1108

+#: clamav-milter.c:1121

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1125

+#: clamav-milter.c:1138

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1140

+#: clamav-milter.c:1153

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1159 clamav-milter.c:1242

+#: clamav-milter.c:1172 clamav-milter.c:1255

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1182

+#: clamav-milter.c:1195

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1194

+#: clamav-milter.c:1207

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1211

+#: clamav-milter.c:1224

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

 msgstr ""

-#: clamav-milter.c:1212 clamav-milter.c:1218

+#: clamav-milter.c:1225 clamav-milter.c:1231

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1217

+#: clamav-milter.c:1230

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

 msgstr ""

-#: clamav-milter.c:1224

+#: clamav-milter.c:1237

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1290

+#: clamav-milter.c:1303

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1291

+#: clamav-milter.c:1304

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

 msgstr ""

-#: clamav-milter.c:1352

+#: clamav-milter.c:1365

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1414

+#: clamav-milter.c:1427

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1423

+#: clamav-milter.c:1436

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1425

+#: clamav-milter.c:1438

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1459

+#: clamav-milter.c:1472

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1475

+#: clamav-milter.c:1488

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1478

+#: clamav-milter.c:1491

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1545 clamav-milter.c:1804

+#: clamav-milter.c:1558 clamav-milter.c:1817

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1550

+#: clamav-milter.c:1563

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:1725

+#: clamav-milter.c:1738

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:1807

+#: clamav-milter.c:1820

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1813

+#: clamav-milter.c:1826

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

 msgstr ""

-#: clamav-milter.c:1849

+#: clamav-milter.c:1862

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:1858

+#: clamav-milter.c:1871

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:1863

+#: clamav-milter.c:1876

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

 msgstr ""

-#: clamav-milter.c:1865

+#: clamav-milter.c:1878

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:1903

+#: clamav-milter.c:1916

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:1908

+#: clamav-milter.c:1921

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:1929

+#: clamav-milter.c:1942

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:1938

+#: clamav-milter.c:1951

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:1939

+#: clamav-milter.c:1952

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:1942

+#: clamav-milter.c:1955

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1943

+#: clamav-milter.c:1956

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1963

+#: clamav-milter.c:1976

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:1972

+#: clamav-milter.c:1985