@@ -1,3 +1,8 @@

+Mon Feb  7 22:13:47 GMT 2005 (njh)

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

+  * clamav-milter:	--detect-forged-email-address

+  			--external: NUL terminate the string read from clamd

+

 Sun Feb  6 22:22:10 CET 2005 (tk)

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

   * contrib/clamdwatch: v0.7.1 (http://mikecathey.com/code/clamdwatch/)

@@ -91,7 +91,7 @@ See http://www.nmt.edu/~wcolburn/sendmail-8.12.5/libmilter/docs/sample.html

 Installations for RedHat Linux and it's derivatives such as YellowDog:

 	Ensure that you have the sendmail-devel RPM installed

-	Add to /etc/mail/sendmail.mc:

+	Add to /etc/mail/sendmail.mc before the MAILER statement:

 	INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav/clmilter.sock, F=, T=S:4m;R:4m')dnl

 	define(`confINPUT_MAIL_FILTERS', `clamav')

@@ -183,7 +183,9 @@ the remote end to resend later (temporary failure), setting F=R will reject

 the email and setting F= will pass the email through, in this case you should

 warn your users that emails are not being scanned.

-Don't forget to rebuild sendmail.cf after modifying sendmail.mc.

+Don't forget to rebuild sendmail.cf after modifying sendmail.mc. You will

+need to restart sendmail after rebuilding sendmail.cf and starting clamd and

+clamav-milter.

 As with all software it is wise to ensure that clamav-milter has the least

 privileges it needs to run. So don't run it as root and don't store the sockets

@@ -679,6 +681,8 @@ Changes

 0.82	6/2/05:		On Solaris, ensure when quarantining a file that the

 				old location is removed

 			Up issue

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

+			NUL terminate the string read from clamd

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.178  2005/02/07 22:11:21  nigelhorne

+ * --detect-forged-email-address

+ *

  * Revision 1.177  2005/02/06 10:39:39  nigelhorne

  * 0.82

  *

@@ -542,9 +545,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.177 2005/02/06 10:39:39 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.178 2005/02/07 22:11:21 nigelhorne Exp $";

-#define	CM_VERSION	"0.82"

+#define	CM_VERSION	"0.82a"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -886,6 +889,11 @@ static	int	advisory = 0;	/*

 				 * are flagged rather than deleted. Incompatible

 				 * with quarantine options

 				 */

+static	int	detect_forged_local_address;	/*

+				 * for incoming only mail servers, drop emails

+				 * claiming to be from us that must be false

+				 * Requires that -o, -l or -f are NOT given

+				 */

 static	short	use_syslog = 0;

 static	const	char	*pidFile;

 static	int	logVerbose = 0;

@@ -967,6 +975,7 @@ help(void)

 	puts(_("\t--broadcast\t\t-B [IFACE]\tBroadcast to a network manager when a virus is found."));

 	puts(_("\t--config-file=FILE\t-c FILE\tRead configuration from FILE."));

 	puts(_("\t--debug\t\t\t-D\tPrint debug messages."));

+	puts(_("\t--detect-forged-local-address\t-L\tReject mails that claim to be from us."));

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

 	puts(_("\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error occurs."));

 	puts(_("\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded."));

@@ -1049,9 +1058,9 @@ main(int argc, char **argv)

 	for(;;) {

 		int opt_index = 0;

 #ifdef	CL_DEBUG

-		const char *args = "a:AbB:c:CDefF:lm:nNop:PqQ:dhHs:St:T:U:Vx:";

+		const char *args = "a:AbB:c:CdDefF:lLm:nNop:PqQ:hHs:St:T:U:Vx:";

 #else

-		const char *args = "a:AbB:c:CDefF:lm:nNop:PqQ:dhHs:St:T:U:V";

+		const char *args = "a:AbB:c:CdDefF:lLm:nNop:PqQ:hHs:St:T:U:V";

 #endif

 		static struct option long_options[] = {

@@ -1071,6 +1080,9 @@ main(int argc, char **argv)

 				"config-file", 1, NULL, 'c'

 			},

 			{

+				"detect-forged-local-address", 0, NULL, 'L'

+			},

+			{

 				"dont-log-clean", 0, NULL, 'C'

 			},

 			{

@@ -1212,6 +1224,9 @@ main(int argc, char **argv)

 			case 'l':	/* scan mail from the lan */

 				lflag++;

 				break;

+			case 'L':	/* detect forged local addresses */

+				detect_forged_local_address++;

+				break;

 			case 'm':	/* maximum number of children */

 				max_children = atoi(optarg);

 				break;

@@ -1308,6 +1323,21 @@ main(int argc, char **argv)

 		return EX_CONFIG;

 	}

+	if(detect_forged_local_address) {

+		if(oflag) {

+			fprintf(stderr, _("%s: --detect-forged-local-addresses is not compatible with --outgoing\n"), argv[0]);

+			return EX_CONFIG;

+		}

+		if(lflag) {

+			fprintf(stderr, _("%s: --detect-forged-local-addresses is not compatible with --local\n"), argv[0]);

+			return EX_CONFIG;

+		}

+		if(fflag) {

+			fprintf(stderr, _("%s: --detect-forged-local-addresses is not compatible with --force\n"), argv[0]);

+			return EX_CONFIG;

+		}

+	}

+

 	if(Bflag) {

 		int on;

@@ -2491,6 +2521,22 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 		return SMFIS_ACCEPT;

 	}

+	if(detect_forged_local_address) {

+		char me[MAXHOSTNAMELEN + 1];

+

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

+			if(use_syslog)

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

+			return SMFIS_CONTINUE;

+		}

+		if(strcasecmp(hostname, me) == 0) {

+			if(use_syslog)

+				syslog(LOG_NOTICE, _("Rejected email falsely claiming to be from here"));

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

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

+			return SMFIS_REJECT;

+		}

+	}

 	return SMFIS_CONTINUE;

 }

@@ -2597,6 +2643,22 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 	if(hflag)

 		privdata->headers = header_list_new();

+	if(detect_forged_local_address) {

+		char me[MAXHOSTNAMELEN + 1];

+

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

+			if(use_syslog)

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

+			return SMFIS_CONTINUE;

+		}

+		if(strstr(argv[0], me)) {

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

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

+			return SMFIS_REJECT;

+		}

+	}

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

 		return SMFIS_CONTINUE;

@@ -2939,16 +3001,19 @@ clamfi_eom(SMFICTX *ctx)

 #endif

 	if(external) {

+		int nbytes;

 #ifdef	SESSION

 #ifdef	CL_DEBUG

 		if(debug_level >= 4)

 			cli_dbgmsg(_("Wating to read status from fd %d\n"),

 				session->sock);

 #endif

-		if(clamd_recv(session->sock, mess, sizeof(mess)) > 0) {

+		nbytes = clamd_recv(session->sock, mess, sizeof(mess) - 1);

 #else

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

+		nbytes = clamd_recv(privdata->cmdSocket, mess, sizeof(mess) - 1);

 #endif

+		if(nbytes > 0) {

+			mess[nbytes] = '\0';

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

 				*ptr = '\0';

@@ -3346,7 +3411,7 @@ clamfi_eom(SMFICTX *ctx)

 		snprintf(reject, sizeof(reject) - 1, _("virus %s detected by ClamAV - http://www.clamav.net"), virusname);

 		smfi_setreply(ctx, (char *)privdata->rejectCode, "5.7.1", reject);

 		broadcast(mess);

-	} else if((ptr = strstr(mess, "OK")) == NULL) {

+	} else if(strstr(mess, "OK") == NULL) {

 		if(!nflag)

 			smfi_addheader(ctx, "X-Virus-Status", _("Unknown"));

 		if(use_syslog)

@@ -4469,6 +4534,8 @@ move(const char *oldfile, const char *newfile)

 	fclose(fout);

 #endif

+	cli_dbgmsg("removing %s\n", oldfile);

+

 	return unlink(oldfile);

 }

@@ -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-01 08:53+0000\n"

+"POT-Creation-Date: 2005-02-07 21:48+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,635 +16,676 @@ msgstr ""

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

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

-#: clamav-milter.c:958

+#: clamav-milter.c:970

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

 msgstr ""

-#: clamav-milter.c:959

+#: clamav-milter.c:971

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

 msgstr ""

-#: clamav-milter.c:960

+#: clamav-milter.c:972

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:961

+#: clamav-milter.c:973

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

 msgstr ""

-#: clamav-milter.c:962

+#: clamav-milter.c:974

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

 msgstr ""

-#: clamav-milter.c:963

+#: clamav-milter.c:975

+msgid ""

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

+msgstr ""

+

+#: clamav-milter.c:976

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:964

+#: clamav-milter.c:977

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:965

+#: clamav-milter.c:978

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

 msgstr ""

-#: clamav-milter.c:966

+#: clamav-milter.c:979

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

 msgstr ""

-#: clamav-milter.c:967

+#: clamav-milter.c:980

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

 msgstr ""

-#: clamav-milter.c:968

+#: clamav-milter.c:981

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

 msgstr ""

-#: clamav-milter.c:969

+#: clamav-milter.c:982

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

 msgstr ""

-#: clamav-milter.c:970

+#: clamav-milter.c:983

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

 msgstr ""

-#: clamav-milter.c:971

+#: clamav-milter.c:984

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

 msgstr ""

-#: clamav-milter.c:972

+#: clamav-milter.c:985

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

 msgstr ""

-#: clamav-milter.c:973

+#: clamav-milter.c:986

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

 msgstr ""

-#: clamav-milter.c:974

+#: clamav-milter.c:987

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

 msgstr ""

-#: clamav-milter.c:975

+#: clamav-milter.c:988

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

 msgstr ""

-#: clamav-milter.c:976

+#: clamav-milter.c:989

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

 msgstr ""

-#: clamav-milter.c:977

+#: clamav-milter.c:990

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

 msgstr ""

-#: clamav-milter.c:978

+#: clamav-milter.c:991

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

 msgstr ""

-#: clamav-milter.c:979

+#: clamav-milter.c:992

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

 msgstr ""

-#: clamav-milter.c:980

+#: clamav-milter.c:993

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

 msgstr ""

-#: clamav-milter.c:981

+#: clamav-milter.c:994

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

 msgstr ""

-#: clamav-milter.c:982

+#: clamav-milter.c:995

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:983

+#: clamav-milter.c:996

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

 msgstr ""

-#: clamav-milter.c:984

+#: clamav-milter.c:997

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

 msgstr ""

-#: clamav-milter.c:985

+#: clamav-milter.c:998

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

 msgstr ""

-#: clamav-milter.c:986

+#: clamav-milter.c:999

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

 msgstr ""

-#: clamav-milter.c:987

+#: clamav-milter.c:1000

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

 msgstr ""

-#: clamav-milter.c:989

+#: clamav-milter.c:1002

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

 msgstr ""

-#: clamav-milter.c:991

+#: clamav-milter.c:1004

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:992

+#: clamav-milter.c:1005

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

 msgstr ""

-#: clamav-milter.c:1287

+#: clamav-milter.c:1304

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1293

+#: clamav-milter.c:1310

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1301

+#: clamav-milter.c:1318

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1340

+#: clamav-milter.c:1325

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1329

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1333

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1372

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1349

+#: clamav-milter.c:1381

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1360

+#: clamav-milter.c:1392

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1377

+#: clamav-milter.c:1409

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1380

+#: clamav-milter.c:1412

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1382

+#: clamav-milter.c:1414

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1387

+#: clamav-milter.c:1419

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1395

+#: clamav-milter.c:1427

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1401

+#: clamav-milter.c:1433

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1407

+#: clamav-milter.c:1439

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1413

+#: clamav-milter.c:1445

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1430

+#: clamav-milter.c:1462

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1456

+#: clamav-milter.c:1488

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1464

+#: clamav-milter.c:1496

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1487

+#: clamav-milter.c:1519

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1497

+#: clamav-milter.c:1529

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1501

+#: clamav-milter.c:1533

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1514

+#: clamav-milter.c:1546

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1524

+#: clamav-milter.c:1556

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1526

+#: clamav-milter.c:1558

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1536 clamav-milter.c:1559

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

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1538 clamav-milter.c:1561

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

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1572

+#: clamav-milter.c:1604

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1589

+#: clamav-milter.c:1621

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1604

+#: clamav-milter.c:1636

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1623 clamav-milter.c:1706

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

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1646

+#: clamav-milter.c:1678

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1658

+#: clamav-milter.c:1690

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1675

+#: clamav-milter.c:1707

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

 msgstr ""

-#: clamav-milter.c:1676 clamav-milter.c:1682

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

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1681

+#: clamav-milter.c:1713

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

 msgstr ""

-#: clamav-milter.c:1688

+#: clamav-milter.c:1720

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1749

+#: clamav-milter.c:1781

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1750

+#: clamav-milter.c:1782

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

 msgstr ""

-#: clamav-milter.c:1822

+#: clamav-milter.c:1854

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1883

+#: clamav-milter.c:1915

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1892

+#: clamav-milter.c:1924

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1894

+#: clamav-milter.c:1926

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1927

+#: clamav-milter.c:1959

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1943

+#: clamav-milter.c:1975

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1946

+#: clamav-milter.c:1978

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:2011 clamav-milter.c:2268

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

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2016

+#: clamav-milter.c:2048

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:2191

+#: clamav-milter.c:2223

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2271

+#: clamav-milter.c:2303

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2277

+#: clamav-milter.c:2309

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

 msgstr ""

-#: clamav-milter.c:2313

+#: clamav-milter.c:2345

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2322

+#: clamav-milter.c:2354

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2327

+#: clamav-milter.c:2359

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

 msgstr ""

-#: clamav-milter.c:2329

+#: clamav-milter.c:2361

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2350

+#: clamav-milter.c:2382

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2355

+#: clamav-milter.c:2387

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2376

+#: clamav-milter.c:2408

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2385

+#: clamav-milter.c:2417

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:2386

+#: clamav-milter.c:2418

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:2389

+#: clamav-milter.c:2421

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2390

+#: clamav-milter.c:2422

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2410

+#: clamav-milter.c:2442

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2419

+#: clamav-milter.c:2451

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2428

+#: clamav-milter.c:2460

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2439

+#: clamav-milter.c:2471

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2456

+#: clamav-milter.c:2488

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2474

+#: clamav-milter.c:2506

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2475

+#: clamav-milter.c:2507

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2483

+#: clamav-milter.c:2515

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2484

+#: clamav-milter.c:2516

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2516

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

+msgid "clamfi_connect: gethostname failed"

+msgstr ""

+

+#: clamav-milter.c:2531

+msgid "Rejected email falsely claiming to be from here"

+msgstr ""

+

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

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

+msgstr ""

+

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

+msgid "Forged local address detected"

+msgstr ""

+

+#: clamav-milter.c:2564

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2517

+#: clamav-milter.c:2565

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2523

+#: clamav-milter.c:2571

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2524

+#: clamav-milter.c:2572

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2529

+#: clamav-milter.c:2577

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2562

+#: clamav-milter.c:2610

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2568

+#: clamav-milter.c:2616

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2570

+#: clamav-milter.c:2618

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

 msgstr ""