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

+Thu May 19 10:33:52 BST 2005 (njh)

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

+  * clamav-milter:	Used some of sendmail V8.13's features for sanity

+				checks and logging

+

 Wed May 18 21:31:34 BST 2005 (njh)

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

   * libclamav:	Extract TNEF files even when the filename isn't known - problem

@@ -188,7 +188,7 @@ You should have received a script to install into /etc/init.d as

 	/etc/init.d/clamav-milter start

 	/etc/init.d/sendmail restart

-2.6 General Instalation Issues

+2.6 General Installation Issues

 You may find INPUT_MAIL_FILTERS is not needed on your machine, however it

 is recommended by the Sendmail documentation and I recommend going along

@@ -252,6 +252,12 @@ able to call sendmail, for example on a Fedora Linux system:

 To test that your clamAV system is now intercepting viruses, visit

 http://www.testvirus.org

+If, under heavy strain on Linux, you see the message

+	thread_create() failed: 12, abort

+appearing in a log file, you will need to increase the number of threads on

+your system (/proc/sys/kernel/threads-max), or decrease the value of

+--max-children.

+

 3. CHANGE HISTORY

 Changes

@@ -774,6 +780,10 @@ Changes

 0.85	11/5/05:	Up-issue

 0.85a	12/5/05:	Open /dev/console before dropping privilege, reported

 				by David Crow <crow@orangeblood.org>

+0.85b	19/5/05:	Warn if TCPAddr doesn't allow connection from us

+			Warn if notification email fails

+			Enable some sendmail debug if LogVerbose is set

+			Added sanity checks that the socket can be created

 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.200 2005/05/12 07:31:09 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.201 2005/05/19 09:32:22 nigelhorne Exp $";

-#define	CM_VERSION	"0.85"

+#define	CM_VERSION	"0.85b"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -105,7 +105,6 @@ int	deny_severity = LOG_NOTICE;

 #ifndef	CL_DEBUG

 static	const	char	*logFile;

-static	int	logTime;

 static	char	console[] = "/dev/console";

 #endif

@@ -149,7 +148,6 @@ typedef	unsigned int	in_addr_t;

  *	to get messages on the system console, see syslog.conf(5), also you

  *	can use wall(1) in the VirusEvent entry in clamd.conf

  * TODO: build with libclamav.so rather than libclamav.a

- * TODO: Warn if TCPAddr doesn't allow connection from us

  * TODO: Decide action (bounce, discard, reject etc.) based on the virus

  *	found. Those with faked addresses, such as SCO.A want discarding,

  *	others could be bounced properly.

@@ -158,6 +156,8 @@ typedef	unsigned int	in_addr_t;

  * TODO: Files can be scanned with "SCAN" not "STREAM" if clamd is on the same

  *	machine when talking via INET domain socket.

  * TODO: Load balancing, allow local machine to talk via UNIX domain socket.

+ * TODO: allow each line in the whitelist file to specify a quarantine email

+ *	address

  */

 struct header_node_t {

@@ -457,6 +457,9 @@ static	int	verifyIncomingSocketName(const char *sockName);

 static	int	isWhitelisted(const char *emailaddress);

 static	void	logger(const char *mess);

+short	logg_time, logg_lock, logok;

+int	logg_size;

+

 static void

 help(void)

 {

@@ -945,7 +948,7 @@ main(int argc, char **argv)

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

 					cpt->strarg, user->pw_uid, user->pw_gid);

 		} else

-			fprintf(stderr, _("%s: running as root is not recommended (check \"User\" in clamd.conf)\n"), argv[0]);

+			fprintf(stderr, _("%s: running as root is not recommended (check \"User\" in %s)\n"), argv[0], cfgfile);

 	} else if(iface) {

 		fprintf(stderr, _("%s: Only root can set an interface for --broadcast\n"), argv[0]);

 		return EX_USAGE;

@@ -1041,9 +1044,10 @@ main(int argc, char **argv)

 		if(cfgopt(copt, "LogVerbose")) {

 			logVerbose = 1;

-#if	0

-			/* Only supported by Sendmail >= V8.13 */

-			smfi_setdbg(6);

+#ifdef	SENDMAIL_VERSION

+			if(strncmp(SENDMAIL_VERSION, "8.13", 4) == 0)

+				/* Only supported by Sendmail >= V8.13 */

+				smfi_setdbg(6);

 #endif

 		}

 		use_syslog = 1;

@@ -1230,6 +1234,11 @@ main(int argc, char **argv)

 			else {

 				cli_warnmsg(_("Can't talk to clamd server %s on port %d\n"),

 					hostname, tcpSocket);

+				if(serverIPs[i] == (int)inet_addr("127.0.0.1")) {

+					if(cfgopt(copt, "TCPAddr") != NULL)

+						cli_warnmsg(_("Check the value for TCPAddr in %s\n"), cfgfile);

+				} else

+					cli_warnmsg(_("Check the value for TCPAddr in clamd.conf on %s\n"), hostname);

 			}

 #endif

@@ -1357,8 +1366,18 @@ main(int argc, char **argv)

 				return EX_CONFIG;

 			}

 			if(open(logFile, O_WRONLY|O_APPEND) < 0) {

-				perror(logFile);

-				return EX_CANTCREAT;

+				if(errno == ENOENT) {

+					/*

+					 * There is low risk race condition here

+					 */

+					if(open(logFile, O_WRONLY|O_CREAT, 0644) < 0) {

+						perror(logFile);

+						return EX_CANTCREAT;

+					}

+				} else {

+					perror(logFile);

+					return EX_CANTCREAT;

+				}

 			}

 		} else {

 			logFile = console;

@@ -1373,10 +1392,20 @@ main(int argc, char **argv)

 		if(consolefd >= 0)

 			close(consolefd);

-		if(cfgopt(copt, "LogTime"))

-			logTime++;

 #endif	/*!CL_DEBUG*/

+		if(cfgopt(copt, "LogTime"))

+			logg_time = 1;

+		if(cfgopt(copt, "LogFileUnlock"))

+			logg_lock = 0;

+		if(cfgopt(copt, "LogClean"))

+			logok = 1;

+		if((cpt = cfgopt(copt, "LogFileMaxSize")))

+			logg_size = cpt->numarg;

+		else

+			logg_size = CL_DEFAULT_LOGSIZE;

+

+

 #ifdef HAVE_SETPGRP

 #ifdef SETPGRP_VOID

 		setpgrp();

@@ -1537,12 +1566,13 @@ main(int argc, char **argv)

 		return EX_UNAVAILABLE;

 	}

-#if	0

-	/* Only supported by Sendmail >= V8.13 */

-	if(smfi_opensocket(1) == MI_FAILURE) {

-		cli_errmsg("can't open/create %s\n", port);

-		return EX_CONFIG;

-	}

+#ifdef	SENDMAIL_VERSION

+	if(strncmp(SENDMAIL_VERSION, "8.13", 4) == 0)

+		/* Only supported by Sendmail >= V8.13 */

+		if(smfi_opensocket(1) == MI_FAILURE) {

+			cli_errmsg("Can't open/create %s\n", port);

+			return EX_CONFIG;

+		}

 #endif

 	signal(SIGPIPE, SIG_IGN);	/* libmilter probably does this as well */

@@ -2986,7 +3016,9 @@ clamfi_eom(SMFICTX *ctx)

 				}

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

-				pclose(sendmail);

+				if(pclose(sendmail) != 0)

+					if(use_syslog)

+						syslog(LOG_ERR, "%s: Failed to notify clamAV interception - see dead.letter", sendmailId);

 			} else if(use_syslog)

 				syslog(LOG_WARNING, _("Can't execute '%s' to send virus notice"), cmd);

 		}

@@ -4428,7 +4460,7 @@ watchdog(void *a)

 				while(n_children > 0) {

 					pthread_cond_wait(&n_children_cond, &n_children_mutex);

-					cli_warnmsg("Waiting for %d children until databae reload\n", n_children);

+					cli_warnmsg("Waiting for %d children until database reload\n", n_children);

 				}

 				cl_statfree(&dbstat);

@@ -4619,7 +4651,7 @@ watchdog(void *a)

 			while(n_children > 0) {

 				pthread_cond_wait(&n_children_cond, &n_children_mutex);

-				cli_warnmsg("Waiting for %d children until databae reload\n", n_children);

+				cli_warnmsg("Waiting for %d children until database reload\n", n_children);

 			}

 			cl_statfree(&dbstat);

 			if(use_syslog)

@@ -5093,7 +5125,7 @@ logger(const char *mess)

 	if(fout == NULL)

 		return;

-	if(logTime) {

+	if(logg_time) {

 #ifdef HAVE_CTIME_R

 		time_t currtime = time((time_t)0);

 		char buf[27];

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

 msgstr ""

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

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

-"POT-Creation-Date: 2005-05-04 20:14+0100\n"

+"POT-Creation-Date: 2005-05-19 10:31+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,717 +16,727 @@ msgstr ""

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

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

-#: clamav-milter.c:464

+#: clamav-milter.c:469

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

 msgstr ""

-#: clamav-milter.c:465

+#: clamav-milter.c:470

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

 msgstr ""

-#: clamav-milter.c:466

+#: clamav-milter.c:471

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:467

+#: clamav-milter.c:472

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

 msgstr ""

-#: clamav-milter.c:468

+#: clamav-milter.c:473

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

 msgstr ""

-#: clamav-milter.c:469

+#: clamav-milter.c:474

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:470

+#: clamav-milter.c:475

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:471

+#: clamav-milter.c:476

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:472

+#: clamav-milter.c:477

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

 msgstr ""

-#: clamav-milter.c:473

+#: clamav-milter.c:478

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

 msgstr ""

-#: clamav-milter.c:474

+#: clamav-milter.c:479

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

 msgstr ""

-#: clamav-milter.c:475

+#: clamav-milter.c:480

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

 msgstr ""

-#: clamav-milter.c:476

+#: clamav-milter.c:481

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

 msgstr ""

-#: clamav-milter.c:477

+#: clamav-milter.c:482

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

 msgstr ""

-#: clamav-milter.c:478

+#: clamav-milter.c:483

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

 msgstr ""

-#: clamav-milter.c:479

+#: clamav-milter.c:484

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

 msgstr ""

-#: clamav-milter.c:480

+#: clamav-milter.c:485

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

 msgstr ""

-#: clamav-milter.c:481

+#: clamav-milter.c:486

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

 msgstr ""

-#: clamav-milter.c:482

+#: clamav-milter.c:487

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

 msgstr ""

-#: clamav-milter.c:483

+#: clamav-milter.c:488

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

 msgstr ""

-#: clamav-milter.c:484

+#: clamav-milter.c:489

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

 msgstr ""

-#: clamav-milter.c:485

+#: clamav-milter.c:490

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

 msgstr ""

-#: clamav-milter.c:486

+#: clamav-milter.c:491

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

 msgstr ""

-#: clamav-milter.c:487

+#: clamav-milter.c:492

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

 msgstr ""

-#: clamav-milter.c:488

+#: clamav-milter.c:493

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

 msgstr ""

-#: clamav-milter.c:489

+#: clamav-milter.c:494

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:490

+#: clamav-milter.c:495

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

 msgstr ""

-#: clamav-milter.c:491

+#: clamav-milter.c:496

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

 msgstr ""

-#: clamav-milter.c:492

+#: clamav-milter.c:497

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

 msgstr ""

-#: clamav-milter.c:493

+#: clamav-milter.c:498

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

 msgstr ""

-#: clamav-milter.c:494

+#: clamav-milter.c:499

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

 msgstr ""

-#: clamav-milter.c:495

+#: clamav-milter.c:500

 msgid ""

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

 "addresses"

 msgstr ""

-#: clamav-milter.c:496

+#: clamav-milter.c:501

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

 msgstr ""

-#: clamav-milter.c:498

+#: clamav-milter.c:503

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

 msgstr ""

-#: clamav-milter.c:500

+#: clamav-milter.c:505

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:501

+#: clamav-milter.c:506

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

 msgstr ""

-#: clamav-milter.c:815

+#: clamav-milter.c:823

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:821

+#: clamav-milter.c:829

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:836

+#: clamav-milter.c:844

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:844

+#: clamav-milter.c:852

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:851

+#: clamav-milter.c:859

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:855

+#: clamav-milter.c:863

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:859

+#: clamav-milter.c:867

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:898

+#: clamav-milter.c:911

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:907

+#: clamav-milter.c:920

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:918

+#: clamav-milter.c:931

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:935

+#: clamav-milter.c:948

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:938

+#: clamav-milter.c:951

 #, c-format

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

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

 msgstr ""

-#: clamav-milter.c:940

+#: clamav-milter.c:953

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:945

+#: clamav-milter.c:958

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:953

+#: clamav-milter.c:966

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:959

+#: clamav-milter.c:972

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:965

+#: clamav-milter.c:978

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:971

+#: clamav-milter.c:984

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:988

+#: clamav-milter.c:1001

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1014

+#: clamav-milter.c:1027

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1022

+#: clamav-milter.c:1035

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1050

+#: clamav-milter.c:1064

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1060

+#: clamav-milter.c:1074

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1064

+#: clamav-milter.c:1078

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1077

+#: clamav-milter.c:1091

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1087

+#: clamav-milter.c:1101

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1089

+#: clamav-milter.c:1103

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1099 clamav-milter.c:1122

+#: clamav-milter.c:1113 clamav-milter.c:1136

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1101 clamav-milter.c:1124

+#: clamav-milter.c:1115 clamav-milter.c:1138

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1135

+#: clamav-milter.c:1149

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1152

+#: clamav-milter.c:1166

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1167

+#: clamav-milter.c:1181

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1186 clamav-milter.c:1271

+#: clamav-milter.c:1200 clamav-milter.c:1290

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1209

+#: clamav-milter.c:1223

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1221

+#: clamav-milter.c:1235

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1238

+#: clamav-milter.c:1239

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1241

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:1257

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

 msgstr ""

-#: clamav-milter.c:1239 clamav-milter.c:1245

+#: clamav-milter.c:1258 clamav-milter.c:1264

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1244

+#: clamav-milter.c:1263

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

 msgstr ""

-#: clamav-milter.c:1251

+#: clamav-milter.c:1270

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1319

+#: clamav-milter.c:1338

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1320

+#: clamav-milter.c:1339

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

 msgstr ""

-#: clamav-milter.c:1388

+#: clamav-milter.c:1430

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1450

+#: clamav-milter.c:1492

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1460

+#: clamav-milter.c:1502

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1462

+#: clamav-milter.c:1504

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1476

+#: clamav-milter.c:1518

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1478

+#: clamav-milter.c:1520

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1541

+#: clamav-milter.c:1584

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1544

+#: clamav-milter.c:1587

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1611 clamav-milter.c:1870

+#: clamav-milter.c:1652 clamav-milter.c:1911

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1616

+#: clamav-milter.c:1657

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:1791

+#: clamav-milter.c:1832

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:1873

+#: clamav-milter.c:1914

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1879

+#: clamav-milter.c:1920

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

 msgstr ""

-#: clamav-milter.c:1915

+#: clamav-milter.c:1956

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:1924

+#: clamav-milter.c:1965

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:1929

+#: clamav-milter.c:1970

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

 msgstr ""

-#: clamav-milter.c:1931

+#: clamav-milter.c:1972

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:1976

+#: clamav-milter.c:2017

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:1981

+#: clamav-milter.c:2022

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:2002

+#: clamav-milter.c:2043

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:2011

+#: clamav-milter.c:2052

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:2012

+#: clamav-milter.c:2053

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:2015

+#: clamav-milter.c:2056

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2016

+#: clamav-milter.c:2057

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2036

+#: clamav-milter.c:2077

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:2045

+#: clamav-milter.c:2086

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2054

+#: clamav-milter.c:2095

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2065

+#: clamav-milter.c:2106

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2082

+#: clamav-milter.c:2123

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2100

+#: clamav-milter.c:2141

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2101

+#: clamav-milter.c:2142

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2109

+#: clamav-milter.c:2150

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2110

+#: clamav-milter.c:2151

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2124

+#: clamav-milter.c:2165

 msgid "clamfi_connect: gethostname failed"

 msgstr ""

-#: clamav-milter.c:2129

+#: clamav-milter.c:2170

 msgid "Rejected email falsely claiming to be from here"

 msgstr ""

-#: clamav-milter.c:2130

+#: clamav-milter.c:2171

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

 msgstr ""

-#: clamav-milter.c:2131 clamav-milter.c:2415

+#: clamav-milter.c:2172 clamav-milter.c:2456