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

+Thu Jun 30 15:51:54 BST 2005 (njh)

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

+  * clamav-milter:	Honour LogClean

+			Only syslog once when storing email in quarantine,

+				reported by Panagiotis Christias, christias

+				at gmail.com

+			Log database reloads to the LogFile

+

 Wed Jun 29 10:45:33 BST 2005 (trog)

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

   * libclamav: enable RAR SFX unpacking

@@ -840,6 +840,11 @@ Changes

 0.85h	27/6/05:	Changed the default child_timeout to 5 minutes

 			Keep a copy of the trie root in privdata

 			Removed trylock/unlock code in clamfi_abort

+0.85i	30/6/05:	Honour Logclean

+			Only syslog once when storing email in quarantine,

+				reported by Panagiotis Christias, christias

+				at gmail.com

+			Log database reloads to the LogFile

 4. INTERNATIONALISATION

@@ -22,9 +22,9 @@

  *

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

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.212 2005/06/27 21:01:09 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.213 2005/06/30 14:51:05 nigelhorne Exp $";

-#define	CM_VERSION	"0.85h"

+#define	CM_VERSION	"0.85i"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -2596,6 +2596,10 @@ clamfi_eom(SMFICTX *ctx)

 		}

 		switch(cl_scanfile(privdata->filename, &virname, &scanned, privdata->root, &limits, options)) {

 			case CL_CLEAN:

+				if(logClean) {

+					snprintf(mess, sizeof(mess), "%s: OK", privdata->filename);

+					logger(mess);

+				}

 				strcpy(mess, "OK");

 				break;

 			case CL_VIRUS:

@@ -2899,9 +2903,6 @@ clamfi_eom(SMFICTX *ctx)

 			free(err);

 		}

-		if(quarantine_dir != NULL)

-			qfile(privdata, sendmailId, virusname);

-

 		if(!qflag) {

 			char cmd[128];

 			FILE *sendmail;

@@ -3018,8 +3019,8 @@ clamfi_eom(SMFICTX *ctx)

 		}

 		if(quarantine_dir) {

-			if(use_syslog)

-				syslog(LOG_NOTICE, _("Quarantined infected mail as %s"), privdata->filename);

+			qfile(privdata, sendmailId, virusname);

+

 			/*

 			 * Cleanup filename here otherwise clamfi_free() will

 			 * delete the file that we wish to keep because it

@@ -3272,6 +3273,12 @@ clamfi_free(struct privdata *privdata)

 			}

 #endif

 		} else if(privdata->root)

+			/*

+			 * Since only one of clamfi_abort() and clamfi_eom()

+			 * can ever be called, and the only cl_dup is in

+			 * clamfi_eom() which calls cl_free soon after, this

+			 * should be overkill, since this can "never happen"

+			 */

 			cl_free(privdata->root);

 		if(privdata->headers)

@@ -4130,7 +4137,7 @@ qfile(struct privdata *privdata, const char *sendmailId, const char *virusname)

 	privdata->filename = newname;

 	if(use_syslog)

-		syslog(LOG_INFO, _("File quarantined as %s"), newname);

+		syslog(LOG_INFO, _("Email quarantined as %s"), newname);

 	return 0;

 }

@@ -4558,6 +4565,13 @@ watchdog(void *a)

 		pthread_mutex_unlock(&watchdog_mutex);

 		/*

+		 * TODO: sanity check that if n_children == 0, that

+		 * root->refcount == 0. Unfortunatly root->refcount isn't

+		 * thread-safe, since it's governed by a mutex that we can't

+		 * see, and there's no access to it via an approved method

+		 */

+

+		/*

 		 * Re-load the database.

 		 */

 		switch(cl_statchkdir(&dbstat)) {

@@ -4580,7 +4594,6 @@ watchdog(void *a)

 				cli_errmsg("Database error - %s is stopping\n", progname);

 				return NULL;

 		}

-		continue;

 	}

 	cli_dbgmsg("watchdog quits\n");

 	return NULL;

@@ -4862,8 +4875,12 @@ loadDatabase(void)

 		syslog(LOG_INFO, _("ClamAV: Protecting against %u viruses"), signatures);

 	}

 	if(oldroot) {

-		cli_dbgmsg("Database updated\n");

+		char mess[128];

+

 		cl_free(oldroot);

+		sprintf(mess, "Database correctly reloaded (%d viruses)\n", signatures);

+		logger(mess);

+		cli_dbgmsg("Database updated\n");

 	} else

 		cli_dbgmsg("Database loaded\n");

@@ -5042,7 +5059,7 @@ logger(const char *mess)

 	puts(mess);

 #else

 	FILE *fout;

-	

+

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

 		fout = stderr;

 	else

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

 msgstr ""

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

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

-"POT-Creation-Date: 2005-06-05 06:38+0100\n"

+"POT-Creation-Date: 2005-06-30 10:14+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,727 +16,727 @@ msgstr ""

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

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

-#: clamav-milter.c:468

+#: clamav-milter.c:470

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

 msgstr ""

-#: clamav-milter.c:469

+#: clamav-milter.c:471

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

 msgstr ""

-#: clamav-milter.c:470

+#: clamav-milter.c:472

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:471

+#: clamav-milter.c:473

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

 msgstr ""

-#: clamav-milter.c:472

+#: clamav-milter.c:474

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

 msgstr ""

-#: clamav-milter.c:473

+#: clamav-milter.c:475

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:474

+#: clamav-milter.c:476

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:475

+#: clamav-milter.c:477

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:476

+#: clamav-milter.c:478

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

 msgstr ""

-#: clamav-milter.c:477

+#: clamav-milter.c:479

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

 msgstr ""

-#: clamav-milter.c:478

+#: clamav-milter.c:480

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

 msgstr ""

-#: clamav-milter.c:479

+#: clamav-milter.c:481

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

 msgstr ""

-#: clamav-milter.c:480

+#: clamav-milter.c:482

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

 msgstr ""

-#: clamav-milter.c:481

+#: clamav-milter.c:483

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

 msgstr ""

-#: clamav-milter.c:482

+#: clamav-milter.c:484

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

 msgstr ""

-#: clamav-milter.c:483

+#: clamav-milter.c:485

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

 msgstr ""

-#: clamav-milter.c:484

+#: clamav-milter.c:486

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

 msgstr ""

-#: clamav-milter.c:485

+#: clamav-milter.c:487

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

 msgstr ""

-#: clamav-milter.c:486

+#: clamav-milter.c:488

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

 msgstr ""

-#: clamav-milter.c:487

+#: clamav-milter.c:489

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

 msgstr ""

-#: clamav-milter.c:488

+#: clamav-milter.c:490

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

 msgstr ""

-#: clamav-milter.c:489

+#: clamav-milter.c:491

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

 msgstr ""

-#: clamav-milter.c:490

+#: clamav-milter.c:492

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

 msgstr ""

-#: clamav-milter.c:491

+#: clamav-milter.c:493

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

 msgstr ""

-#: clamav-milter.c:492

+#: clamav-milter.c:494

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

 msgstr ""

-#: clamav-milter.c:493

+#: clamav-milter.c:495

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:494

+#: clamav-milter.c:496

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

 msgstr ""

-#: clamav-milter.c:495

+#: clamav-milter.c:497

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

 msgstr ""

-#: clamav-milter.c:496

+#: clamav-milter.c:498

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

 msgstr ""

-#: clamav-milter.c:497

+#: clamav-milter.c:499

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

 msgstr ""

-#: clamav-milter.c:498

+#: clamav-milter.c:500

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

 msgstr ""

-#: clamav-milter.c:499

+#: clamav-milter.c:501

 msgid ""

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

 "addresses"

 msgstr ""

-#: clamav-milter.c:500

+#: clamav-milter.c:502

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

 msgstr ""

-#: clamav-milter.c:502

+#: clamav-milter.c:504

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

 msgstr ""

-#: clamav-milter.c:504

+#: clamav-milter.c:506

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:505

+#: clamav-milter.c:507

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

 msgstr ""

-#: clamav-milter.c:828

+#: clamav-milter.c:830

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:834

+#: clamav-milter.c:836

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:849

+#: clamav-milter.c:851

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:861

+#: clamav-milter.c:863

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:868

+#: clamav-milter.c:870

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:872

+#: clamav-milter.c:874

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:876

+#: clamav-milter.c:878

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:920

+#: clamav-milter.c:922

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:929

+#: clamav-milter.c:931

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:940

+#: clamav-milter.c:942

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:957

+#: clamav-milter.c:959

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:960

+#: clamav-milter.c:962

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:962

+#: clamav-milter.c:964

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:967

+#: clamav-milter.c:969

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:975

+#: clamav-milter.c:977

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:981

+#: clamav-milter.c:983

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:987

+#: clamav-milter.c:989

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:993

+#: clamav-milter.c:995

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1010

+#: clamav-milter.c:1012

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1040

+#: clamav-milter.c:1042

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1049

+#: clamav-milter.c:1051

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1076

+#: clamav-milter.c:1078

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1086

+#: clamav-milter.c:1088

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1090

+#: clamav-milter.c:1093

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1103

+#: clamav-milter.c:1107

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1113

+#: clamav-milter.c:1117

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1115

+#: clamav-milter.c:1119

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1125 clamav-milter.c:1148

+#: clamav-milter.c:1129 clamav-milter.c:1152

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1127 clamav-milter.c:1150

+#: clamav-milter.c:1131 clamav-milter.c:1154

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1161

+#: clamav-milter.c:1165

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1178

+#: clamav-milter.c:1182

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1193

+#: clamav-milter.c:1197

 #, c-format

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

 msgstr ""

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

+#: clamav-milter.c:1216 clamav-milter.c:1306

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1235

+#: clamav-milter.c:1239

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1247

+#: clamav-milter.c:1251

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1251

+#: clamav-milter.c:1255

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1253

+#: clamav-milter.c:1257

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1269

+#: clamav-milter.c:1273

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

 msgstr ""

-#: clamav-milter.c:1270 clamav-milter.c:1276

+#: clamav-milter.c:1274 clamav-milter.c:1280

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1275

+#: clamav-milter.c:1279

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

 msgstr ""

-#: clamav-milter.c:1282

+#: clamav-milter.c:1286

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1350

+#: clamav-milter.c:1354

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1351

+#: clamav-milter.c:1355

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

 msgstr ""

-#: clamav-milter.c:1437

+#: clamav-milter.c:1441

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1498

+#: clamav-milter.c:1502

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1508

+#: clamav-milter.c:1512

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1510

+#: clamav-milter.c:1514

 #, c-format

 msgid "pidfile '%s' must be a full pathname\n"

 msgstr ""

-#: clamav-milter.c:1524

+#: clamav-milter.c:1528

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1526

+#: clamav-milter.c:1530

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1588

+#: clamav-milter.c:1592

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1591

+#: clamav-milter.c:1595

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1656 clamav-milter.c:1915

+#: clamav-milter.c:1660 clamav-milter.c:1919

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1661

+#: clamav-milter.c:1665

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:1836

+#: clamav-milter.c:1840

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:1918

+#: clamav-milter.c:1922

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1924

+#: clamav-milter.c:1928

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

 msgstr ""

-#: clamav-milter.c:1960

+#: clamav-milter.c:1964

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:1969

+#: clamav-milter.c:1973

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:1974

+#: clamav-milter.c:1978

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

 msgstr ""

-#: clamav-milter.c:1976

+#: clamav-milter.c:1980

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:1997

+#: clamav-milter.c:2001

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2002

+#: clamav-milter.c:2006

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2023

+#: clamav-milter.c:2027

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2032

+#: clamav-milter.c:2036

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:2033

+#: clamav-milter.c:2037

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:2036

+#: clamav-milter.c:2040

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2037

+#: clamav-milter.c:2041

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2057

+#: clamav-milter.c:2061

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2066

+#: clamav-milter.c:2070

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2075

+#: clamav-milter.c:2079

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2086

+#: clamav-milter.c:2090

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2103

+#: clamav-milter.c:2107

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2121

+#: clamav-milter.c:2125

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2122

+#: clamav-milter.c:2126

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2130

+#: clamav-milter.c:2134

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2131

+#: clamav-milter.c:2135

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2145

+#: clamav-milter.c:2149

 msgid "clamfi_connect: gethostname failed"

 msgstr ""

-#: clamav-milter.c:2150

+#: clamav-milter.c:2154

 msgid "Rejected email falsely claiming to be from here"

 msgstr ""

-#: clamav-milter.c:2151

+#: clamav-milter.c:2155

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

 msgstr ""

-#: clamav-milter.c:2152 clamav-milter.c:2436

+#: clamav-milter.c:2156 clamav-milter.c:2440

 msgid "Forged local address detected"

 msgstr ""

-#: clamav-milter.c:2180

+#: clamav-milter.c:2184

 msgid "Rejected email with empty from field"

 msgstr ""

-#: clamav-milter.c:2181

+#: clamav-milter.c:2185

 msgid "You have not said who the email is from"

 msgstr ""

-#: clamav-milter.c:2182

+#: clamav-milter.c:2186

 msgid "Reject email with empty from field"

 msgstr ""

-#: clamav-milter.c:2204

+#: clamav-milter.c:2208

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2205

+#: clamav-milter.c:2209

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2211

+#: clamav-milter.c:2215

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2212

+#: clamav-milter.c:2216

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2217

+#: clamav-milter.c:2221

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2250

+#: clamav-milter.c:2254

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2256

+#: clamav-milter.c:2260

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2258

+#: clamav-milter.c:2262

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

 msgstr ""

-#: clamav-milter.c:2401

+#: clamav-milter.c:2405

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2404

+#: clamav-milter.c:2408

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2428

+#: clamav-milter.c:2432

 msgid "clamfi_eoh: gethostname failed"

 msgstr ""

-#: clamav-milter.c:2434

+#: clamav-milter.c:2438

 #, c-format

 msgid "Rejected email falsely claiming to be from %s"

 msgstr ""

-#: clamav-milter.c:2435

+#: clamav-milter.c:2439

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