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

+Thu Dec  2 11:10:31 GMT 2004 (njh)

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

+  * clamav-milter:	--internal now notices when the database has been

+				updated

+

 Wed Dec  1 22:29:33 GMT 2004 (njh)

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

   * clamav-milter:	Added --internal flag (some functionality to do)

@@ -571,6 +571,9 @@ Changes

 		Not all previous X-Virus-Status headers were removed

 		Added the --internal flag

 			TODO: freshclam notification and version headers

+0.80v	2/12/04: --internal now notices when freshclam has been run

+		The default value for --timeout has been changed from 60

+			seconds to 0 (wait forever)

 INTERNATIONALISATION

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

  *

  * Change History:

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

+ * Revision 1.156  2004/12/02 11:09:05  nigelhorne

+ * --internal now reloads the database

+ *

  * Revision 1.155  2004/12/01 22:27:38  nigelhorne

  * Added --internal

  *

@@ -476,9 +479,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.155 2004/12/01 22:27:38 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.156 2004/12/02 11:09:05 nigelhorne Exp $";

-#define	CM_VERSION	"0.80u"

+#define	CM_VERSION	"0.80v"

 /*#define	CONFDIR	"/usr/local/etc"*/

@@ -697,6 +700,7 @@ static	void	*watchdog(void *a);

 static	int	logg_facility(const char *name);

 static	void	quit(void);

 static	void	broadcast(const char *mess);

+static	int	loadDatabase(void);

 #ifdef	SESSION

 static	char	**clamav_versions;

@@ -707,6 +711,8 @@ static	char	clamav_version[VERSION_LENGTH + 1];

 static	int	fflag = 0;	/* force a scan, whatever */

 static	int	oflag = 0;	/* scan messages from our machine? */

 static	int	lflag = 0;	/* scan messages from our site? */

+

+/* Variables for --internal */

 static	int	internal = 0;	/* scan messages ourself or use clamd? */

 static	struct	cl_node	*root = NULL;

 static	struct	cl_limits	limits;

@@ -790,7 +796,7 @@ static	pthread_mutex_t	n_children_mutex = PTHREAD_MUTEX_INITIALIZER;

 static	pthread_cond_t	n_children_cond = PTHREAD_COND_INITIALIZER;

 static	unsigned	int	n_children = 0;

 static	unsigned	int	max_children = 0;

-static	int	child_timeout = 60;	/* number of seconds to wait for

+static	int	child_timeout = 0;	/* number of seconds to wait for

 					 * a child to die. Set to 0 to

 					 * wait forever

 					 */

@@ -1371,72 +1377,16 @@ main(int argc, char **argv)

 	 * we're doing the scanning internally

 	 */

 	if(internal) {

-		int signatures = 0;

-		int ret;

-		extern const char *cl_retdbdir(void);	/* FIXME */

-		const char *dbdir = cl_retdbdir();

-

-		/*

-		 * TODO: Set a better version string if DataDirectory hasn't

-		 * been set

-		 * TODO: Set limits

-		 */

-		if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory")))

-			if(strcmp(dbdir, cpt->strarg) != 0) {

-				char *daily = cli_malloc(strlen(cpt->strarg) + strlen(dbdir) + 15);

-				struct cl_cvd *d1;

-				time_t t = (time_t)0;

-				int v = 0;

-

-				sprintf(daily, "%s/daily.cvd", cpt->strarg);

-				if((d1 = cl_cvdhead(daily))) {

-					struct cl_cvd *d2;

-

-					t = d1->stime;

-					v = d1->version;

-

-					sprintf(daily, "%s/daily.cvd", dbdir);

-					if((d2 = cl_cvdhead(daily))) {

-						if(d1->version > d2->version)

-							dbdir = cpt->strarg;

-						else

-							dbdir = dbdir;

-						t = d2->stime;

-						v = d2->version;

-						cl_cvdfree(d2);

-					} else

-						dbdir = cpt->strarg;

-					cl_cvdfree(d1);

-				}

-				free(daily);

-

-				if(t)

-					snprintf(version, sizeof(version) - 1,

-						"ClamAV %s/%d/%s", VERSION, v,

-						ctime(&t));

-

-			}

-

-		ret = cl_loaddbdir(dbdir, &root, &signatures);

-		if(ret != 0) {

-			fprintf(stderr, "%s\n", cl_strerror(ret));

+		if(max_children == 0) {

+			fprintf(stderr, _("%s: --max-children must be given in internal mode\n"), argv[0]);

 			return EX_CONFIG;

 		}

-		if(!root) {

-			fputs("Can't initialize the virus database.\n", stderr);

+		if(child_timeout) {

+			fprintf(stderr, _("%s: --timeout must not be given in internal mode\n"), argv[0]);

 			return EX_CONFIG;

 		}

-

-		ret = cl_build(root);

-		if(ret != 0) {

-			fprintf(stderr, "Database initialization error: %s\n", cl_strerror(ret));

+		if(loadDatabase() != 0)

 			return EX_CONFIG;

-		}

-		if(use_syslog)

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

-

-		cl_statinidir(dbdir, &dbstat);

-

 	} else if((cpt = cfgopt(copt, "LocalSocket")) != NULL) {

 #ifdef	SESSION

 		struct sockaddr_un server;

@@ -1624,10 +1574,12 @@ main(int argc, char **argv)

 	}

 	if(internal) {

-		clamav_versions = (char **)cli_malloc(sizeof(char *));

-		if(clamav_versions == NULL)

-			return EX_TEMPFAIL;

-		clamav_version = strdup(version);

+		if(clamav_versions == NULL) {

+			clamav_versions = (char **)cli_malloc(sizeof(char *));

+			if(clamav_versions == NULL)

+				return EX_TEMPFAIL;

+			clamav_version = strdup(version);

+		}

 #ifdef	SESSION

 	} else {

 		clamav_versions = (char **)cli_malloc(numServers * sizeof(char *));

@@ -1769,8 +1721,6 @@ main(int argc, char **argv)

 	if(use_syslog) {

 		if(logVerbose)

 			syslog(LOG_INFO, _("Starting: %s"), clamav_version);

-		else

-			syslog(LOG_INFO, "%s", clamav_version);

 #ifdef	CL_DEBUG

 		if(debug_level > 0)

 			syslog(LOG_DEBUG, _("Debugging is on"));

@@ -2319,7 +2269,7 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 			}

 			/*

 			 * Wait for an amount of time for a child to go (default

-			 * 60 seconds).

+			 * wait for ever)

 			 *

 			 * Use pthread_cond_timedwait rather than

 			 * pthread_cond_wait since the sendmail which calls

@@ -3823,7 +3773,6 @@ connect2clamd(struct privdata *privdata)

 				cli_warnmsg(_("Expected port information from clamd, got '%s'\n"),

 					buf);

 #ifdef	SESSION

-			pthread_mutex_lock(&sstatus_mutex);

 			session->status = CMDSOCKET_DOWN;

 			pthread_mutex_unlock(&sstatus_mutex);

 #endif

@@ -4310,11 +4259,21 @@ watchdog(void *a)

 		if(internal) {

 			/*

-			 * TODO: reload automatically

+			 * Re-load the database if the server's not busy.

+			 * TODO: If a reload is needed go into a mode when

+			 *	new scans aren't accepted, to force the number

+			 *	of children to 0 so that we can reload,

+			 *	otherwise a reload may not occur on overloaded

+			 *	servers

 			 */

-			if((n_children == 0) && (cl_statchkdir(&dbstat) == 1))

+			pthread_mutex_lock(&n_children_mutex);

+			if((n_children == 0) && (cl_statchkdir(&dbstat) == 1)) {

 				if(use_syslog)

-					syslog(LOG_WARNING, _("Freshclam has been run - please restart clamav-milter\n"));

+					syslog(LOG_WARNING, _("Loading new database"));

+				if(loadDatabase() != 0)

+					exit(EX_CONFIG);

+			}

+			pthread_mutex_unlock(&n_children_mutex);

 			continue;

 		}

 		i = 0;

@@ -4551,3 +4510,98 @@ broadcast(const char *mess)

 	if(sendto(broadcastSock, mess, strlen(mess), 0, (struct sockaddr *)&s, sizeof(struct sockaddr_in)) < 0)

 		perror("sendto");

 }

+

+/*

+ * Load a new database into the internal scanner - it is up to the caller to

+ * ensure that no threads are currently scanning

+ */

+static int

+loadDatabase(void)

+{

+	extern const char *cl_retdbdir(void);	/* FIXME: should be included */

+	int ret, firsttime, signatures, v;

+	time_t t;

+	char *daily, *ptr;

+	struct cl_cvd *d;

+	const struct cfgstruct *cpt;

+	static const char *dbdir;

+

+	assert(internal);

+

+	firsttime = (dbdir == NULL);

+

+	if(firsttime) {

+		/*

+		 * TODO: Set limits

+		 */

+

+		if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory")))

+			dbdir = cpt->strarg;

+		else

+			dbdir = cl_retdbdir();

+	}

+

+	daily = cli_malloc(strlen(dbdir) + 11);

+	sprintf(daily, "%s/daily.cvd", dbdir);

+

+	d = cl_cvdhead(daily);

+

+	if(d == NULL) {

+		cli_errmsg("Can't find %s\n", daily);

+		free(daily);

+		return -1;

+	}

+

+	t = d->stime;

+	v = d->version;

+

+	cl_cvdfree(d);

+	free(daily);

+

+#ifdef	SESSION

+	if(clamav_versions == NULL) {

+		clamav_versions = (char **)cli_malloc(sizeof(char *));

+		if(clamav_versions == NULL)

+			return -1;

+		clamav_version = cli_malloc(VERSION_LENGTH + 1);

+		if(clamav_version == NULL) {

+			free(clamav_versions);

+			clamav_versions = NULL;

+			return -1;

+		}

+	}

+#endif

+	snprintf(clamav_version, VERSION_LENGTH,

+		"ClamAV %s/%d/%s", VERSION, v, ctime(&t));

+	/* Remove ctime's trailing \n */

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

+		*ptr = '\0';

+

+	if(root) {

+		cl_free(root);

+		root = NULL;

+	}

+	signatures = 0;

+	ret = cl_loaddbdir(dbdir, &root, &signatures);

+	if(ret != 0) {

+		cli_errmsg("%s\n", cl_strerror(ret));

+		return -1;

+	}

+	if(root == NULL) {

+		cli_errmsg("Can't initialize the virus database.\n");

+		return -1;

+	}

+

+	ret = cl_build(root);

+	if(ret != 0) {

+		cli_errmsg("Database initialization error: %s\n", cl_strerror(ret));

+		return -1;

+	}

+	if(use_syslog)

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

+

+	if(use_syslog)

+		syslog(LOG_INFO, _("Loaded %s\n"), clamav_version);

+

+	return cl_statinidir(dbdir, &dbstat);

+}

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

 msgstr ""

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

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

-"POT-Creation-Date: 2004-12-01 22:27+0000\n"

+"POT-Creation-Date: 2004-12-02 11:07+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,582 +16,587 @@ msgstr ""

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

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

-#: clamav-milter.c:861

+#: clamav-milter.c:867

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

 msgstr ""

-#: clamav-milter.c:862

+#: clamav-milter.c:868

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

 msgstr ""

-#: clamav-milter.c:863

+#: clamav-milter.c:869

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:864

+#: clamav-milter.c:870

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

 msgstr ""

-#: clamav-milter.c:865

+#: clamav-milter.c:871

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

 msgstr ""

-#: clamav-milter.c:866

+#: clamav-milter.c:872

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:867

+#: clamav-milter.c:873

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:868

+#: clamav-milter.c:874

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

 msgstr ""

-#: clamav-milter.c:869

+#: clamav-milter.c:875

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

 msgstr ""

-#: clamav-milter.c:870

+#: clamav-milter.c:876

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

 msgstr ""

-#: clamav-milter.c:871

+#: clamav-milter.c:877

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

 msgstr ""

-#: clamav-milter.c:872

+#: clamav-milter.c:878

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

 msgstr ""

-#: clamav-milter.c:873

+#: clamav-milter.c:879

 msgid "\t--internal\t\t-I\tUse the internal scanner."

 msgstr ""

-#: clamav-milter.c:874

+#: clamav-milter.c:880

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

 msgstr ""

-#: clamav-milter.c:875

+#: clamav-milter.c:881

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

 msgstr ""

-#: clamav-milter.c:876

+#: clamav-milter.c:882

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

 msgstr ""

-#: clamav-milter.c:877

+#: clamav-milter.c:883

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

 msgstr ""

-#: clamav-milter.c:878

+#: clamav-milter.c:884

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

 msgstr ""

-#: clamav-milter.c:879

+#: clamav-milter.c:885

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

 msgstr ""

-#: clamav-milter.c:880

+#: clamav-milter.c:886

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

 msgstr ""

-#: clamav-milter.c:881

+#: clamav-milter.c:887

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

 msgstr ""

-#: clamav-milter.c:882

+#: clamav-milter.c:888

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

 msgstr ""

-#: clamav-milter.c:883

+#: clamav-milter.c:889

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

 msgstr ""

-#: clamav-milter.c:884

+#: clamav-milter.c:890

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

 msgstr ""

-#: clamav-milter.c:885

+#: clamav-milter.c:891

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:886

+#: clamav-milter.c:892

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

 msgstr ""

-#: clamav-milter.c:887

+#: clamav-milter.c:893

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

 msgstr ""

-#: clamav-milter.c:888

+#: clamav-milter.c:894

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

 msgstr ""

-#: clamav-milter.c:889

+#: clamav-milter.c:895

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

 msgstr ""

-#: clamav-milter.c:890

+#: clamav-milter.c:896

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

 msgstr ""

-#: clamav-milter.c:892

+#: clamav-milter.c:898

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

 msgstr ""

-#: clamav-milter.c:894

+#: clamav-milter.c:900

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:895

+#: clamav-milter.c:901

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

 msgstr ""

-#: clamav-milter.c:1187

+#: clamav-milter.c:1193

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1196

+#: clamav-milter.c:1202

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1235

+#: clamav-milter.c:1241

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1244

+#: clamav-milter.c:1250

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1255

+#: clamav-milter.c:1261

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1272

+#: clamav-milter.c:1278

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1275

+#: clamav-milter.c:1281

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1277

+#: clamav-milter.c:1283

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1282

+#: clamav-milter.c:1288

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1289

+#: clamav-milter.c:1295

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1305

+#: clamav-milter.c:1311

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1331

+#: clamav-milter.c:1337

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1339

+#: clamav-milter.c:1345

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1362

+#: clamav-milter.c:1368

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1433

+#: clamav-milter.c:1378

 #, c-format

-msgid "ClamAV: Protecting against %d viruses"

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

 msgstr ""

-#: clamav-milter.c:1444

+#: clamav-milter.c:1382

+#, c-format

+msgid "%s: --timeout must not be given in internal mode\n"

+msgstr ""

+

+#: clamav-milter.c:1394

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1454

+#: clamav-milter.c:1404

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1456

+#: clamav-milter.c:1406

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1466 clamav-milter.c:1489

+#: clamav-milter.c:1416 clamav-milter.c:1439

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1468 clamav-milter.c:1491

+#: clamav-milter.c:1418 clamav-milter.c:1441

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1502

+#: clamav-milter.c:1452

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1519

+#: clamav-milter.c:1469

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1534

+#: clamav-milter.c:1484

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1553

+#: clamav-milter.c:1503

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1576

+#: clamav-milter.c:1526

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1588

+#: clamav-milter.c:1538

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1605

+#: clamav-milter.c:1555

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

 msgstr ""

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

+#: clamav-milter.c:1556 clamav-milter.c:1562

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1611

+#: clamav-milter.c:1561

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

 msgstr ""

-#: clamav-milter.c:1618

+#: clamav-milter.c:1568

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1667

+#: clamav-milter.c:1619

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1668

+#: clamav-milter.c:1620

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

 msgstr ""

-#: clamav-milter.c:1715

+#: clamav-milter.c:1667

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1724

+#: clamav-milter.c:1676

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1726

+#: clamav-milter.c:1678

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1754

+#: clamav-milter.c:1706

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1768

+#: clamav-milter.c:1720

 #, c-format

 msgid "Starting: %s"

 msgstr ""

-#: clamav-milter.c:1773

+#: clamav-milter.c:1723

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1827 clamav-milter.c:2071

+#: clamav-milter.c:1777 clamav-milter.c:2021

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1832 clamav-milter.c:2080

+#: clamav-milter.c:1782 clamav-milter.c:2030

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

 msgstr ""

-#: clamav-milter.c:1997

+#: clamav-milter.c:1947

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:2074

+#: clamav-milter.c:2024

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2116

+#: clamav-milter.c:2066

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:2125

+#: clamav-milter.c:2075

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:2130

+#: clamav-milter.c:2080

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

 msgstr ""

-#: clamav-milter.c:2132

+#: clamav-milter.c:2082

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:2153

+#: clamav-milter.c:2103

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:2158

+#: clamav-milter.c:2108

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2179

+#: clamav-milter.c:2129

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2187

+#: clamav-milter.c:2137

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2188

+#: clamav-milter.c:2138

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2207

+#: clamav-milter.c:2157

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2212

+#: clamav-milter.c:2162

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2222

+#: clamav-milter.c:2172

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2239

+#: clamav-milter.c:2189

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2257

+#: clamav-milter.c:2207

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2258

+#: clamav-milter.c:2208

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2266

+#: clamav-milter.c:2216

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2267

+#: clamav-milter.c:2217

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2301

+#: clamav-milter.c:2251

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2302

+#: clamav-milter.c:2252

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2308

+#: clamav-milter.c:2258

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2309

+#: clamav-milter.c:2259

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2314

+#: clamav-milter.c:2264

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2344

+#: clamav-milter.c:2294

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2350

+#: clamav-milter.c:2300

 msgid "Timeout waiting for a child to die"

 msgstr ""