@@ -1,3 +1,9 @@

+Wed Oct 24 09:08:12 BST 2007 (njh)

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

+  * clamav-milter:	Improved SPF checking for phish false positives

+  			Improved chroot failure diagnostics

+			Added option to report phish false positives

+

 Tue Oct 23 12:05:05 BST 2007 (trog)

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

   * libclamunrar: move unrar to a separate library, under an unrar license.

@@ -33,7 +33,7 @@

  */

 static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.312 2007/02/12 22:24:21 njh Exp $";

-#define	CM_VERSION	"0.92rc2"

+#define	CM_VERSION	"devel-20081024"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -517,6 +517,7 @@ static	const	char	*postmaster = "postmaster";

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

 static	int	quitting;

 static	const	char	*report;	/* Report Phishing to this address */

+static	const	char	*report_fps;	/* Report Phish FPs to this address */

 static	const	char	*whitelistFile;	/*

 					 * file containing destination email

@@ -613,6 +614,7 @@ help(void)

 	puts(_("\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."));

 	puts(_("\t--quarantine=USER\t-Q EMAIL\tQuarantine e-mail account."));

 	puts(_("\t--report-phish=EMAIL\t-r EMAIL\tReport phish to this email address."));

+	puts(_("\t--report-phish-false-positives=EMAIL\t-R EMAIL\tReport phish false positves to this email address."));

 	puts(_("\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."));

 	puts(_("\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running clamd (when using TCPsocket)."));

 	puts(_("\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify"));

@@ -710,15 +712,15 @@ main(int argc, char **argv)

 		int opt_index = 0;

 #ifdef	BOUNCE

 #ifdef	CL_DEBUG

-		const char *args = "a:AbB:c:C:dDefF:I:k:K:lLm:M:nNop:PqQ:r:hHs:St:T:U:VwW:x:0:1:2";

+		const char *args = "a:AbB:c:C:dDefF:I:k:K:lLm:M:nNop:PqQ:r:R:hHs:St:T:U:VwW:x:0:1:2";

 #else

-		const char *args = "a:AbB:c:C:dDefF:I:k:K:lLm:M:nNop:PqQ:r:hHs:St:T:U:VwW:0:1:2";

+		const char *args = "a:AbB:c:C:dDefF:I:k:K:lLm:M:nNop:PqQ:r:R:hHs:St:T:U:VwW:0:1:2";

 #endif

 #else	/*!BOUNCE*/

 #ifdef	CL_DEBUG

-		const char *args = "a:AB:c:C:dDefF:I:k:K:lLm:M:nNop:PqQ:r:hHs:St:T:U:VwW:x:0:1:2";

+		const char *args = "a:AB:c:C:dDefF:I:k:K:lLm:M:nNop:PqQ:r:R:hHs:St:T:U:VwW:x:0:1:2";

 #else

-		const char *args = "a:AB:c:C:dDefF:I:k:K:lLm:M:nNop:PqQ:r:hHs:St:T:U:VwW:0:1:2";

+		const char *args = "a:AB:c:C:dDefF:I:k:K:lLm:M:nNop:PqQ:r:R:hHs:St:T:U:VwW:0:1:2";

 #endif

 #endif	/*BOUNCE*/

@@ -804,7 +806,10 @@ main(int argc, char **argv)

 				"quarantine", 1, NULL, 'Q',

 			},

 			{

-				"report-phishing", 1, NULL, 'r'

+				"report-phish", 1, NULL, 'r'

+			},

+			{

+				"report-phish-false-positives", 1, NULL, 'R'

 			},

 			{

 				"quarantine-dir", 1, NULL, 'U',

@@ -974,6 +979,9 @@ main(int argc, char **argv)

 				/* e.g. reportphishing@antiphishing.org */

 				report = optarg;

 				break;

+			case 'R':	/* report phishing false positives here */

+				report_fps = optarg;

+				break;

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

 				server++;

 				serverHostNames = optarg;

@@ -1731,7 +1739,7 @@ main(int argc, char **argv)

 	if(report) {

 		if(!cfgopt(copt, "PhishingSignatures")->enabled) {

-			fprintf(stderr, "%s: You have chosen --report, but PhishingSignatures is off in %s\n",

+			fprintf(stderr, "%s: You have chosen --report-phish, but PhishingSignatures is off in %s\n",

 				argv[0], cfgfile);

 			return EX_USAGE;

 		}

@@ -1754,6 +1762,12 @@ main(int argc, char **argv)

 			return EX_USAGE;

 		}

 	}

+	if(report_fps)

+		if(!cfgopt(copt, "PhishingSignatures")->enabled) {

+			fprintf(stderr, "%s: You have chosen --report-phish-false-positives, but PhishingSignatures is off in %s\n",

+				argv[0], cfgfile);

+			return EX_USAGE;

+		}

 	if(cfgopt(copt, "Foreground")->enabled)

 		logg_foreground = 1;

@@ -1935,10 +1949,12 @@ main(int argc, char **argv)

 		if(getuid() == 0) {

 			if(chdir(rootdir) < 0) {

 				perror(rootdir);

+				logg("!chdir %s failed\n", rootdir);

 				return EX_CONFIG;

 			}

 			if(chroot(rootdir) < 0) {

 				perror(rootdir);

+				logg("!chroot %s failed\n", rootdir);

 				return EX_CONFIG;

 			}

 			logg("Chrooted to %s\n", rootdir);

@@ -2205,6 +2221,9 @@ pingServer(int serverNumber)

 			perror("socket");

 			return 0;

 		}

+		/*

+		 * FIXME: use non-blocking connect

+		 */

 		if(connect(sock, (struct sockaddr *)&server, sizeof(struct sockaddr_in)) < 0) {

 			int is_connected = 0;

@@ -3027,19 +3046,32 @@ clamfi_header(SMFICTX *ctx, char *headerf, char *headerv)

 	if((strcasecmp(headerf, "Message-ID") == 0) &&

 	   (strncasecmp(headerv, "<MDAEMON", 8) == 0))

 		privdata->discard = 1;

-	else if(strcasecmp(headerf, "Subject") == 0) {

+	else if((strcasecmp(headerf, "Subject") == 0) && headerv) {

 		if(privdata->subject)

 			free(privdata->subject);

 		if(headerv)

 			privdata->subject = cli_strdup(headerv);

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

 		privdata->statusCount++;

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

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

 		if(privdata->sender)

 			free(privdata->sender);

-		if(headerv)

-			privdata->sender = cli_strdup(headerv);

+		privdata->sender = cli_strdup(headerv);

+	}

+#ifdef	HAVE_RESOLV_H

+	else if((strcasecmp(headerf, "From") == 0) && headerv) {

+		/*

+		 * SPF check against the from header, since the SMTP header

+		 * may be valid. This is not what the SPF spec says, but I

+		 * have seen SPF matches on what are clearly phishes, so by

+		 * checking against the from: header we're less likely to

+		 * FP a real phish

+		 */

+		if(privdata->from)

+			free(privdata->from);

+		privdata->from = cli_strdup(headerv);

 	}

+#endif

 	if(!useful_header(headerf)) {

 		logg("*Discarded the header\n");

@@ -3519,6 +3551,32 @@ clamfi_eom(SMFICTX *ctx)

 			logg(_("%s: Ignoring %s false positive from %s received from %s\n"),

 				sendmailId, mess, privdata->from, privdata->ip);

 			strcpy(mess, "OK");

+			/*

+			 * Report false positive to ClamAV, works best when

+			 * clamav-milter has had to create a local copy of

+			 * the email, e.g. when --quarantine-dir is on

+			 */

+			if(report_fps &&

+			   (smfi_addrcpt(ctx, report_fps) == MI_FAILURE)) {

+				if(privdata->filename) {

+					char cmd[1024];

+

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

+						"mail -s \"False Positive: %s\" %s < %s",

+						mess, report_fps,

+						privdata->filename);

+					if(system(cmd) == 0)

+						logg(_("#Reported phishing false positive to %s"), report_fps);

+					else

+						logg(_("^Couldn't report false positive to %s\n"), report_fps);

+				} else

+					/*

+					 * Most likely this is because we're

+					 * attempting to add a recipient on

+					 * another host

+					 */

+					logg(_("^Can't set phish FP header\n"));

+			}

 		}

 		tableDestroy(prevhosts);

 	}

@@ -6213,7 +6271,7 @@ spf(struct privdata *privdata, table_t *prevhosts)

 	if(privdata->from == NULL)

 		return 0;

-	if((host = strchr(privdata->from, '@')) == NULL)

+	if((host = strrchr(privdata->from, '@')) == NULL)

 		return 0;

 	host = cli_strdup(++host);

@@ -6322,7 +6380,11 @@ spf(struct privdata *privdata, table_t *prevhosts)

 #endif

 					mask = MAKEMASK(preflen);

 					if((ntohl(remote_ip.s_addr) & mask) == (ntohl(spf_range.s_addr) & mask)) {

-						logg("#SPF ip4 pass\n");

+						if(privdata->subject)

+							logg("#SPF ip4 pass (%s) %s is valid for %s\n",

+								privdata->subject, ip, host);

+						else

+							logg("#SPF ip4 pass %s is valid for %s\n", ip, host);

 						privdata->spf_ok = 1;

 					}

 				} else if(strcmp(record, "mx") == 0) {

@@ -6402,7 +6464,10 @@ spf_ip(char *ip, int zero, void *v)

 	struct privdata *privdata = (struct privdata *)v;

 	if(strcmp(ip, privdata->ip) == 0) {

-		logg("#SPF mx/a pass %s\n", ip);

+		if(privdata->subject)

+			logg("#SPF mx/a pass (%s) %s\n", privdata->subject, ip);

+		else

+			logg("#SPF mx/a pass %s\n", ip);

 		privdata->spf_ok = 1;

 	}

 }

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

 msgstr ""

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

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

-"POT-Creation-Date: 2007-07-17 14:13+0100\n"

+"POT-Creation-Date: 2007-10-24 09:05+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,746 +16,775 @@ msgstr ""

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

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

-#: clamav-milter.c:583

+#: clamav-milter.c:585

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

 msgstr ""

-#: clamav-milter.c:584

+#: clamav-milter.c:586

 msgid "\t--blacklist-time=SECS\t-k\tTime (in seconds) to blacklist an IP."

 msgstr ""

-#: clamav-milter.c:585

+#: clamav-milter.c:587

 msgid "\t--black-hole-mode\t\tDon't scan messages aliased to /dev/null."

 msgstr ""

-#: clamav-milter.c:587

+#: clamav-milter.c:589

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

 msgstr ""

-#: clamav-milter.c:589

+#: clamav-milter.c:591

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:590

+#: clamav-milter.c:592

 msgid "\t--chroot=DIR\t\t-C DIR\tChroot to dir when starting."

 msgstr ""

-#: clamav-milter.c:591

+#: clamav-milter.c:593

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

 msgstr ""

-#: clamav-milter.c:592

+#: clamav-milter.c:594

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

 msgstr ""

-#: clamav-milter.c:593

+#: clamav-milter.c:595

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:594

+#: clamav-milter.c:596

 msgid "\t--dont-blacklist\t-K\tDon't blacklist a given IP."

 msgstr ""

-#: clamav-milter.c:595

+#: clamav-milter.c:597

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:596

+#: clamav-milter.c:598

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

 msgstr ""

-#: clamav-milter.c:597

+#: clamav-milter.c:599

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

 msgstr ""

-#: clamav-milter.c:598

+#: clamav-milter.c:600

 msgid ""

 "\t--freshclam-monitor=SECS\t-M SECS\tHow often to check for database update."

 msgstr ""

-#: clamav-milter.c:599

+#: clamav-milter.c:601

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

 msgstr ""

-#: clamav-milter.c:600

+#: clamav-milter.c:602

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

 msgstr ""

-#: clamav-milter.c:601

+#: clamav-milter.c:603

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

 msgstr ""

-#: clamav-milter.c:602

+#: clamav-milter.c:604

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

 msgstr ""

-#: clamav-milter.c:603

+#: clamav-milter.c:605

 msgid ""

 "\t--ignore IPaddr\t\t-I IPaddr\tAdd IPaddr to LAN IP list (see --local)."

 msgstr ""

-#: clamav-milter.c:604

+#: clamav-milter.c:606

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

 msgstr ""

-#: clamav-milter.c:605

+#: clamav-milter.c:607

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

 msgstr ""

-#: clamav-milter.c:606

+#: clamav-milter.c:608

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

 msgstr ""

-#: clamav-milter.c:607

+#: clamav-milter.c:609

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

 msgstr ""

-#: clamav-milter.c:608

+#: clamav-milter.c:610

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

 msgstr ""

-#: clamav-milter.c:609

+#: clamav-milter.c:611

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

 msgstr ""

-#: clamav-milter.c:610

+#: clamav-milter.c:612

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

 msgstr ""

-#: clamav-milter.c:611

+#: clamav-milter.c:613

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

 msgstr ""

-#: clamav-milter.c:612

+#: clamav-milter.c:614

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

 msgstr ""

-#: clamav-milter.c:613

+#: clamav-milter.c:615

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

 msgstr ""

-#: clamav-milter.c:614

+#: clamav-milter.c:616

 msgid "\t--report-phish=EMAIL\t-r EMAIL\tReport phish to this email address."

 msgstr ""

-#: clamav-milter.c:615

+#: clamav-milter.c:617

+msgid ""

+"\t--report-phish-false-positives=EMAIL\t-R EMAIL\tReport phish false "

+"positves to this email address."

+msgstr ""

+

+#: clamav-milter.c:618

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

 msgstr ""

-#: clamav-milter.c:616

+#: clamav-milter.c:619

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:617

+#: clamav-milter.c:620

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

 msgstr ""

-#: clamav-milter.c:618

+#: clamav-milter.c:621

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

 msgstr ""

-#: clamav-milter.c:619

+#: clamav-milter.c:622

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

 msgstr ""

-#: clamav-milter.c:620

+#: clamav-milter.c:623

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

 msgstr ""

-#: clamav-milter.c:621

+#: clamav-milter.c:624

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:622

+#: clamav-milter.c:625

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

 msgstr ""

-#: clamav-milter.c:623

+#: clamav-milter.c:626

 msgid ""

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

 "addresses"

 msgstr ""

-#: clamav-milter.c:624

+#: clamav-milter.c:627

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

 msgstr ""

-#: clamav-milter.c:626

+#: clamav-milter.c:629

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

 msgstr ""

-#: clamav-milter.c:628

+#: clamav-milter.c:631

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:629

+#: clamav-milter.c:632

 msgid "For bug reports, please refer to http://www.clamav.net/bugs"

 msgstr ""

-#: clamav-milter.c:925

+#: clamav-milter.c:931

 #, c-format

 msgid "%s: %s, -I may only be given %d times\n"

 msgstr ""

-#: clamav-milter.c:931

+#: clamav-milter.c:937

 #, c-format

 msgid "%s: Cannot convert -I%s to IPaddr\n"

 msgstr ""

-#: clamav-milter.c:1042

+#: clamav-milter.c:1051

 #, c-format

 msgid "%s: SESSIONS mode requires --external\n"

 msgstr ""

-#: clamav-milter.c:1050

+#: clamav-milter.c:1059

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1057

+#: clamav-milter.c:1066

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1073

+#: clamav-milter.c:1082

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1085

+#: clamav-milter.c:1094

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1092

+#: clamav-milter.c:1101

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1096

+#: clamav-milter.c:1105

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1100

+#: clamav-milter.c:1109

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1144

+#: clamav-milter.c:1153

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1153

+#: clamav-milter.c:1162

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1164

+#: clamav-milter.c:1173

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1178

+#: clamav-milter.c:1191

 #, c-format

-msgid "%s: You cannot use black hole mode unless you are root\n"

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

 msgstr ""

-#: clamav-milter.c:1188

+#: clamav-milter.c:1247

 #, c-format

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

+msgid "%s: You cannot use black hole mode unless %s is a TrustedUser\n"

 msgstr ""

-#: clamav-milter.c:1191

+#: clamav-milter.c:1253

 #, c-format

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

+msgid "^%s: running as root is not recommended (check \"User\" in %s)\n"

 msgstr ""

-#: clamav-milter.c:1194

+#: clamav-milter.c:1255

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1199

+#: clamav-milter.c:1260

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1207

+#: clamav-milter.c:1268

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1213

+#: clamav-milter.c:1274

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1219

+#: clamav-milter.c:1280

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1225

+#: clamav-milter.c:1286

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1242

+#: clamav-milter.c:1303

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1284

+#: clamav-milter.c:1344

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1293

+#: clamav-milter.c:1353

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1326

+#: clamav-milter.c:1386

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1342

+#: clamav-milter.c:1402

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1346

+#: clamav-milter.c:1406

 #, c-format

 msgid "%s: --freshclam_monitor must be at least one second\n"

 msgstr ""

-#: clamav-milter.c:1360

+#: clamav-milter.c:1420

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1373

+#: clamav-milter.c:1433

 #, c-format

 msgid "%s: No emails will be scanned"

 msgstr ""

-#: clamav-milter.c:1384

+#: clamav-milter.c:1444

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1389

+#: clamav-milter.c:1449

 #, c-format

 msgid "%s: You cannot use the --server option when using LocalSocket in %s\n"

 msgstr ""

-#: clamav-milter.c:1399

+#: clamav-milter.c:1459

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1401

+#: clamav-milter.c:1461

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1411 clamav-milter.c:1438

+#: clamav-milter.c:1471 clamav-milter.c:1498

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1413 clamav-milter.c:1440

+#: clamav-milter.c:1473 clamav-milter.c:1500

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1450

+#: clamav-milter.c:1510

 msgid "!Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1467

+#: clamav-milter.c:1527

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1482

+#: clamav-milter.c:1542

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1561 clamav-milter.c:1694

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1507

+#: clamav-milter.c:1567

 #, c-format

 msgid ""

 "%1$s: --max-children (%2$d) is lower than the number of servers you have (%3"

 "$d)\n"

 msgstr ""

-#: clamav-milter.c:1534

+#: clamav-milter.c:1594

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1564

+#: clamav-milter.c:1624

 msgid "Waiting for clamd to come up\n"

 msgstr ""

-#: clamav-milter.c:1578

+#: clamav-milter.c:1638

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1582

+#: clamav-milter.c:1642

 #, c-format

 msgid "Check the value for TCPAddr in %s\n"

 msgstr ""

-#: clamav-milter.c:1584

+#: clamav-milter.c:1644

 #, c-format

 msgid "Check the value for TCPAddr in clamd.conf on %s\n"

 msgstr ""

-#: clamav-milter.c:1600 clamav-milter.c:1608 clamav-milter.c:4646

+#: clamav-milter.c:1660 clamav-milter.c:1668 clamav-milter.c:4773

 msgid "!Can't find any clamd server\n"

 msgstr ""

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

+#: clamav-milter.c:1661 clamav-milter.c:1666

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1614

+#: clamav-milter.c:1674

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1711

+#: clamav-milter.c:1777

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1712

+#: clamav-milter.c:1778

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

 msgstr ""

-#: clamav-milter.c:1820

+#: clamav-milter.c:1886

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1880

+#: clamav-milter.c:1946

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1906

+#: clamav-milter.c:1974

 #, c-format

 msgid "!pidfile: '%s' must be a full pathname"

 msgstr ""

-#: clamav-milter.c:1922

+#: clamav-milter.c:1990

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1990

+#: clamav-milter.c:2058

 #, c-format

 msgid "Starting %s\n"

 msgstr ""

-#: clamav-milter.c:1991

+#: clamav-milter.c:2059

 msgid "*Debugging is on\n"

 msgstr ""

-#: clamav-milter.c:2084

+#: clamav-milter.c:2159

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2089

+#: clamav-milter.c:2164

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:2297

+#: clamav-milter.c:2374

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2418

+#: clamav-milter.c:2495

 msgid "^Couldn't establish a connexion to any clamd server\n"

 msgstr ""

-#: clamav-milter.c:2442

+#: clamav-milter.c:2519

 #, c-format

 msgid "^findServer: select failed (maxsock = %d)\n"

 msgstr ""

-#: clamav-milter.c:2456

+#: clamav-milter.c:2533

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

 msgstr ""

-#: clamav-milter.c:2525

+#: clamav-milter.c:2602

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2529

+#: clamav-milter.c:2606

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

 msgstr ""

-#: clamav-milter.c:2553

+#: clamav-milter.c:2630

 msgid "!clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2557

+#: clamav-milter.c:2634

 msgid "!clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2593

+#: clamav-milter.c:2670

 #, c-format

 msgid "clamfi_connect: Unexpected sa_family %d\n"

 msgstr ""

-#: clamav-milter.c:2603

+#: clamav-milter.c:2680

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2611

+#: clamav-milter.c:2688

 #, c-format

 msgid "clamfi_connect: connexion from %s"