@@ -684,6 +684,7 @@ Changes

 0.82a	7/2/05:		Added --detect-forged-email-address

 			NUL terminate the string read from clamd

 0.82b	8/2/05:		Don't use clamd's SESSION command

+0.82c	8/2/05:		Tidy some code and debug statements

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.181  2005/02/08 12:05:28  nigelhorne

+ * Tidy some code and debug statements

+ *

  * Revision 1.180  2005/02/08 09:01:26  nigelhorne

  * Turn off SESSION mode

  *

@@ -551,9 +554,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.180 2005/02/08 09:01:26 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.181 2005/02/08 12:05:28 nigelhorne Exp $";

-#define	CM_VERSION	"0.82b"

+#define	CM_VERSION	"0.82c"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -948,7 +951,6 @@ static	const	char	*ignoredEmailAddresses[] = {

 	"postmaster@bandsman.co.uk",

 	"<Mailer-Daemon@bandsman.co.uk>",

 	"<postmaster@bandsman.co.uk>",*/

-	NULL,	/* --quarantine email address goes here */

 	NULL

 };

@@ -969,6 +971,7 @@ static	void	print_trace(void);

 #endif

 static	int	verifyIncomingSocketName(const char *sockName);

+static	int	isWhitelisted(const char *emailaddress);

 static void

 help(void)

@@ -1627,7 +1630,7 @@ main(int argc, char **argv)

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

 		 */

 		if(quarantine_dir) {

-			fprintf(stderr, _("%s: --quarantine-dir not supported for remote scanning - use --quarantine\n"), argv[0]);

+			fprintf(stderr, _("%s: --quarantine-dir not supported for TCPSocket - use --quarantine\n"), argv[0]);

 			return EX_CONFIG;

 		}

@@ -1843,17 +1846,6 @@ main(int argc, char **argv)

 	atexit(quit);

-	/*

-	 * Don't scan messages to the quarantine email address

-	 */

-	if(quarantine) {

-		const char **s;

-

-		for(s = ignoredEmailAddresses; *s; s++)

-			;

-		*s = quarantine;

-	}

-

 	if(!external) {

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

@@ -2527,7 +2519,11 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 		return SMFIS_ACCEPT;

 	}

-	if(detect_forged_local_address) {

+#if	defined(HAVE_INET_NTOP) || defined(WITH_TCPWRAP)

+	if(detect_forged_local_address && !isLocalAddr(inet_addr(ip))) {

+#else

+	if(detect_forged_local_address && !isLocalAddr(inet_addr(remoteIP))) {

+#endif

 		char me[MAXHOSTNAMELEN + 1];

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

@@ -2649,7 +2645,7 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 	if(hflag)

 		privdata->headers = header_list_new();

-	if(detect_forged_local_address) {

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

 		char me[MAXHOSTNAMELEN + 1];

 		const char *ptr;

@@ -2662,8 +2658,9 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 		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 me, but you are not"));

+			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;

 		}

 	}

@@ -2806,23 +2803,14 @@ clamfi_eoh(SMFICTX *ctx)

 	 *	FI

 	 * ENDFOR

 	 */

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

-		const char **s;

-

-		for(s = ignoredEmailAddresses; *s; s++)

-			if(strcasecmp(*s, *to) == 0)

-				/*

-				 * This recipient is on the whitelist

-				 */

-				break;

-

-		if(*s == NULL)

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

+		if(!isWhitelisted(*to))

 			/*

 			 * This recipient is not on the whitelist,

 			 * no need to check any further

 			 */

 			return SMFIS_CONTINUE;

-	}

+

 	/*

 	 * Didn't find a recipient who is not on the white list, so all

 	 * must be on the white list, so just accept the e-mail

@@ -3261,6 +3249,7 @@ clamfi_eom(SMFICTX *ctx)

 				(oflag || fflag) ? "%s -t -i -odq" : "%s -t -i",

 				SENDMAIL_BIN);

+			cli_dbgmsg("Calling %s\n", cmd);

 			sendmail = popen(cmd, "w");

 			if(sendmail) {

@@ -3359,6 +3348,7 @@ clamfi_eom(SMFICTX *ctx)

 				}

+				cli_dbgmsg("Waiting for %s to finish\n", cmd);

 				pclose(sendmail);

 			}

 		}

@@ -3644,14 +3634,12 @@ clamfi_free(struct privdata *privdata)

 		/*

 		 * Deliberately errs on the side of broadcasting too many times

 		 */

-		if(n_children > 0) {

-			--n_children;

-#ifdef	SESSION

-			if(n_children == 0)

+		if(n_children > 0)

+			if(--n_children == 0) {

+				cli_dbgmsg("clamav-milter is idle\n");

 				if(pthread_cond_broadcast(&watchdog_cond) < 0)

 					perror("pthread_cond_broadcast");

-#endif

-		}

+			}

 #ifdef	CL_DEBUG

 		cli_dbgmsg("pthread_cond_broadcast\n");

 #endif

@@ -4452,7 +4440,6 @@ qfile(struct privdata *privdata, const char *sendmailId, const char *virusname)

 	cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);

 	if(move(privdata->filename, newname) < 0) {

-		perror(newname);

 		if(use_syslog)

 			syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"),

 				privdata->filename, newname);

@@ -5056,7 +5043,7 @@ broadcast(const char *mess)

 	memset(&s, '\0', sizeof(struct sockaddr_in));

 	s.sin_family = AF_INET;

-	s.sin_port = (in_port_t)htons(tcpSocket);

+	s.sin_port = (in_port_t)htons(tcpSocket ? tcpSocket : 3310);

 	s.sin_addr.s_addr = htonl(INADDR_BROADCAST);

 	cli_dbgmsg("broadcast %s to %d\n", mess, broadcastSock);

@@ -5264,3 +5251,27 @@ verifyIncomingSocketName(const char *sockName)

 	return 1;

 #endif

 }

+

+/*

+ * If the given email address is whitelisted don't scan their emails

+ */

+static int

+isWhitelisted(const char *emailaddress)

+{

+	const char **a;

+

+	for(a = ignoredEmailAddresses; *a; a++)

+		if(strcasecmp(*a, emailaddress) == 0)

+			/*

+			 * This recipient is on the whitelist

+			 */

+			return 1;

+

+	/*

+	 * Don't scan messages to the quarantine email address

+	 */

+	if(quarantine && (strcasecmp(quarantine, emailaddress) == 0))

+		return 1;

+

+	return 0;

+}

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

 msgstr ""

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

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

-"POT-Creation-Date: 2005-02-07 21:48+0000\n"

+"POT-Creation-Date: 2005-02-08 12:04+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,676 +16,679 @@ msgstr ""

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

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

-#: clamav-milter.c:970

+#: clamav-milter.c:979

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

 msgstr ""

-#: clamav-milter.c:971

+#: clamav-milter.c:980

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

 msgstr ""

-#: clamav-milter.c:972

+#: clamav-milter.c:981

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:973

+#: clamav-milter.c:982

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

 msgstr ""

-#: clamav-milter.c:974

+#: clamav-milter.c:983

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

 msgstr ""

-#: clamav-milter.c:975

+#: clamav-milter.c:984

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:976

+#: clamav-milter.c:985

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:977

+#: clamav-milter.c:986

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:978

+#: clamav-milter.c:987

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

 msgstr ""

-#: clamav-milter.c:979

+#: clamav-milter.c:988

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

 msgstr ""

-#: clamav-milter.c:980

+#: clamav-milter.c:989

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

 msgstr ""

-#: clamav-milter.c:981

+#: clamav-milter.c:990

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

 msgstr ""

-#: clamav-milter.c:982

+#: clamav-milter.c:991

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

 msgstr ""

-#: clamav-milter.c:983

+#: clamav-milter.c:992

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

 msgstr ""

-#: clamav-milter.c:984

+#: clamav-milter.c:993

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

 msgstr ""

-#: clamav-milter.c:985

+#: clamav-milter.c:994

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

 msgstr ""

-#: clamav-milter.c:986

+#: clamav-milter.c:995

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

 msgstr ""

-#: clamav-milter.c:987

+#: clamav-milter.c:996

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

 msgstr ""

-#: clamav-milter.c:988

+#: clamav-milter.c:997

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

 msgstr ""

-#: clamav-milter.c:989

+#: clamav-milter.c:998

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

 msgstr ""

-#: clamav-milter.c:990

+#: clamav-milter.c:999

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

 msgstr ""

-#: clamav-milter.c:991

+#: clamav-milter.c:1000

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

 msgstr ""

-#: clamav-milter.c:992

+#: clamav-milter.c:1001

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

 msgstr ""

-#: clamav-milter.c:993

+#: clamav-milter.c:1002

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

 msgstr ""

-#: clamav-milter.c:994

+#: clamav-milter.c:1003

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

 msgstr ""

-#: clamav-milter.c:995

+#: clamav-milter.c:1004

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:996

+#: clamav-milter.c:1005

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

 msgstr ""

-#: clamav-milter.c:997

+#: clamav-milter.c:1006

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

 msgstr ""

-#: clamav-milter.c:998

+#: clamav-milter.c:1007

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

 msgstr ""

-#: clamav-milter.c:999

+#: clamav-milter.c:1008

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

 msgstr ""

-#: clamav-milter.c:1000

+#: clamav-milter.c:1009

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

 msgstr ""

-#: clamav-milter.c:1002

+#: clamav-milter.c:1011

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

 msgstr ""

-#: clamav-milter.c:1004

+#: clamav-milter.c:1013

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:1005

+#: clamav-milter.c:1014

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

 msgstr ""

-#: clamav-milter.c:1304

+#: clamav-milter.c:1313

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1310

+#: clamav-milter.c:1319

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1318

+#: clamav-milter.c:1327

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1325

+#: clamav-milter.c:1334

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1329

+#: clamav-milter.c:1338

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1333

+#: clamav-milter.c:1342

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1372

+#: clamav-milter.c:1381

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1381

+#: clamav-milter.c:1390

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1392

+#: clamav-milter.c:1401

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1409

+#: clamav-milter.c:1418

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1412

+#: clamav-milter.c:1421

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1414

+#: clamav-milter.c:1423

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1419

+#: clamav-milter.c:1428

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1427

+#: clamav-milter.c:1436

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1433

+#: clamav-milter.c:1442

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1439

+#: clamav-milter.c:1448

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1445

+#: clamav-milter.c:1454

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1462

+#: clamav-milter.c:1471

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1488

+#: clamav-milter.c:1497

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1496

+#: clamav-milter.c:1505

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1519

+#: clamav-milter.c:1528

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1529

+#: clamav-milter.c:1538

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1533

+#: clamav-milter.c:1542

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1546

+#: clamav-milter.c:1555

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1556

+#: clamav-milter.c:1565

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1558

+#: clamav-milter.c:1567

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1568 clamav-milter.c:1591

+#: clamav-milter.c:1577 clamav-milter.c:1600

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1570 clamav-milter.c:1593

+#: clamav-milter.c:1579 clamav-milter.c:1602

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1604

+#: clamav-milter.c:1613

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1621

+#: clamav-milter.c:1630

 #, c-format

-msgid ""

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

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

 msgstr ""

-#: clamav-milter.c:1636

+#: clamav-milter.c:1645

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1655 clamav-milter.c:1738

+#: clamav-milter.c:1664 clamav-milter.c:1747

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1678

+#: clamav-milter.c:1687

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1690

+#: clamav-milter.c:1699

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1707

+#: clamav-milter.c:1716

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

 msgstr ""

-#: clamav-milter.c:1708 clamav-milter.c:1714

+#: clamav-milter.c:1717 clamav-milter.c:1723

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1713

+#: clamav-milter.c:1722

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

 msgstr ""

-#: clamav-milter.c:1720

+#: clamav-milter.c:1729

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1781

+#: clamav-milter.c:1790

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1782

+#: clamav-milter.c:1791

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

 msgstr ""

-#: clamav-milter.c:1854

+#: clamav-milter.c:1852

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1915

+#: clamav-milter.c:1913

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1924

+#: clamav-milter.c:1922

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1926

+#: clamav-milter.c:1924

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1959

+#: clamav-milter.c:1957

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1975

+#: clamav-milter.c:1973

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1978

+#: clamav-milter.c:1976

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:2043 clamav-milter.c:2300

+#: clamav-milter.c:2041 clamav-milter.c:2298

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2048

+#: clamav-milter.c:2046

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:2223

+#: clamav-milter.c:2221

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2303

+#: clamav-milter.c:2301

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2309

+#: clamav-milter.c:2307

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

 msgstr ""

-#: clamav-milter.c:2345

+#: clamav-milter.c:2343

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2354

+#: clamav-milter.c:2352

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2359

+#: clamav-milter.c:2357

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

 msgstr ""

-#: clamav-milter.c:2361

+#: clamav-milter.c:2359

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2382

+#: clamav-milter.c:2380

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2387

+#: clamav-milter.c:2385

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2408

+#: clamav-milter.c:2406

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2417

+#: clamav-milter.c:2415

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:2418

+#: clamav-milter.c:2416

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:2421

+#: clamav-milter.c:2419

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2422

+#: clamav-milter.c:2420

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2442

+#: clamav-milter.c:2440

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2451

+#: clamav-milter.c:2449

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2460

+#: clamav-milter.c:2458

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2471

+#: clamav-milter.c:2469

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2488

+#: clamav-milter.c:2486

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2506

+#: clamav-milter.c:2504

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2507

+#: clamav-milter.c:2505

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2515

+#: clamav-milter.c:2513

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2516

+#: clamav-milter.c:2514

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2526 clamav-milter.c:2648

+#: clamav-milter.c:2528 clamav-milter.c:2651

 msgid "clamfi_connect: gethostname failed"

 msgstr ""

-#: clamav-milter.c:2531

+#: clamav-milter.c:2533

 msgid "Rejected email falsely claiming to be from here"

 msgstr ""

-#: clamav-milter.c:2532 clamav-milter.c:2654

+#: clamav-milter.c:2534

 msgid "You have claimed to be me, but you are not"

 msgstr ""

-#: clamav-milter.c:2533 clamav-milter.c:2655

+#: clamav-milter.c:2535 clamav-milter.c:2659

 msgid "Forged local address detected"

 msgstr ""

-#: clamav-milter.c:2564

+#: clamav-milter.c:2566

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2565

+#: clamav-milter.c:2567

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2571

+#: clamav-milter.c:2573

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2572

+#: clamav-milter.c:2574

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2577

+#: clamav-milter.c:2579

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2610

+#: clamav-milter.c:2612

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2616

+#: clamav-milter.c:2618

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2618

+#: clamav-milter.c:2620

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

 msgstr ""