@@ -1,7 +1,12 @@

+Sat Mar  5 11:07:34 GMT 2005 (njh)

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

+  * clamav-milter:	Note about --local needed if incoming socket is INET

+				domain

+

 Fri Mar  4 14:20:22 GMT 2005 (njh)

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

   * libclamav/blob.c:	Fix for QNX version 6 sometimes returning ETOOLONG,

-  				patch from mikep at kaluga.org

+				patch from mikep at kaluga.org

 Fri Mar  4 03:18:20 CET 2005 (tk)

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

@@ -67,7 +72,7 @@ Sun Feb 27 02:26:42 CET 2005 (tk)

 Thu Feb 24 18:37:45 CET 2005 (tk)

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

   * libclamav/scanners.c: fix NULL pointer dereference in metadata scanner

-			  (thanks to Nigel)	

+			  (thanks to Nigel)

 Wed Feb 23 09:42:52 GMT 2005 (njh)

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

@@ -169,9 +169,9 @@ or if clamd is on a different machine

 If you want clamav-milter to listen on TCP for communication with sendmail,

 for example if they are on different machines use inet:<port>.

 On machine A (running sendmail) you would have in sendmail.mc:

-INPUT_MAIL_FILTER(`clamav', `S=inet:3311@machineb, F=, T=S:4m;R:4m')dnl

+	INPUT_MAIL_FILTER(`clamav', `S=inet:3311@machineb, F=, T=S:4m;R:4m')dnl

 On machine B (running clamav-milter) you would start up clamav-milter thus:

-clamav-milter inet:3311

+	clamav-milter inet:3311

 You should have received a script to put into /etc/init.d with this software.

@@ -703,6 +703,9 @@ Changes

 				system for the database reload, rather than

 				wait for it to happen by itself

 0.84	3/3/05:		Up-issue

+0.84a	5/3/05:		Note that when the connection to sendmail is via TCP/IP

+				rather than a UNIX domain socket, that --local

+				must be given

 INTERNATIONALISATION

@@ -24,9 +24,9 @@

  *

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

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.186 2005/03/03 09:21:34 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.187 2005/03/05 11:06:03 nigelhorne Exp $";

-#define	CM_VERSION	"0.83b"

+#define	CM_VERSION	"0.84a"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -802,6 +802,18 @@ main(int argc, char **argv)

 		fprintf(stderr, _("%s: socket-addr (%s) doesn't agree with sendmail.cf\n"), argv[0], port);

 		return EX_CONFIG;

 	}

+	if(strncasecmp(port, "inet:", 5) == 0)

+		if(!lflag) {

+			/*

+			 * Barmy but true. It seems that clamfi_connect will,

+			 * in this case, get the IP address of the machine

+			 * running sendmail, not of the machine sending the

+			 * mail, so the remote end will be a local address so

+			 * we must scan by enabling --local

+			 */

+			fprintf(stderr, _("%s: when using inet: connection to sendmail you must enable --local\n"), argv[0]);

+			return EX_USAGE;

+		}

 	/*

 	 * Sanity checks on the clamav configuration file

@@ -1408,9 +1420,10 @@ main(int argc, char **argv)

 		if((fd = fopen(pidfile, "w")) == NULL) {

 			if(use_syslog)

-				syslog(LOG_WARNING, _("Can't save PID in file %s"),

+				syslog(LOG_ERR, _("Can't save PID in file %s"),

 					pidfile);

-			cli_warnmsg(_("Can't save PID in file %s\n"), pidfile);

+			cli_errmsg(_("Can't save PID in file %s\n"), pidfile);

+			return EX_CONFIG;

 		} else {

 #ifdef	C_LINUX

 			/* Ensure that all threads are kill()ed */

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

 msgstr ""

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

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

-"POT-Creation-Date: 2005-03-03 09:21+0000\n"

+"POT-Creation-Date: 2005-03-05 11: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"

@@ -182,525 +182,530 @@ msgstr ""

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

 msgstr ""

-#: clamav-milter.c:810

+#: clamav-milter.c:814

+#, c-format

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

+msgstr ""

+

+#: clamav-milter.c:822

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:817

+#: clamav-milter.c:829

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:821

+#: clamav-milter.c:833

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:825

+#: clamav-milter.c:837

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:864

+#: clamav-milter.c:876

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:873

+#: clamav-milter.c:885

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:884

+#: clamav-milter.c:896

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:901

+#: clamav-milter.c:913

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:904

+#: clamav-milter.c:916

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:906

+#: clamav-milter.c:918

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:911

+#: clamav-milter.c:923

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:919

+#: clamav-milter.c:931

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:925

+#: clamav-milter.c:937

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:931

+#: clamav-milter.c:943

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:937

+#: clamav-milter.c:949

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:954

+#: clamav-milter.c:966

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:980

+#: clamav-milter.c:992

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:988

+#: clamav-milter.c:1000

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1011

+#: clamav-milter.c:1023

 #, c-format

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:1021

+#: clamav-milter.c:1033

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1025

+#: clamav-milter.c:1037

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1038

+#: clamav-milter.c:1050

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1048

+#: clamav-milter.c:1060

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1050

+#: clamav-milter.c:1062

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1060 clamav-milter.c:1083

+#: clamav-milter.c:1072 clamav-milter.c:1095

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1062 clamav-milter.c:1085

+#: clamav-milter.c:1074 clamav-milter.c:1097

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1096

+#: clamav-milter.c:1108

 msgid "Can't create a clamd session"

 msgstr ""

-#: clamav-milter.c:1113

+#: clamav-milter.c:1125

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1128

+#: clamav-milter.c:1140

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1147 clamav-milter.c:1230

+#: clamav-milter.c:1159 clamav-milter.c:1242

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1170

+#: clamav-milter.c:1182

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1182

+#: clamav-milter.c:1194

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1199

+#: clamav-milter.c:1211

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

 msgstr ""

-#: clamav-milter.c:1200 clamav-milter.c:1206

+#: clamav-milter.c:1212 clamav-milter.c:1218

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1205

+#: clamav-milter.c:1217

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

 msgstr ""

-#: clamav-milter.c:1212

+#: clamav-milter.c:1224

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1278

+#: clamav-milter.c:1290

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1279

+#: clamav-milter.c:1291

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

 msgstr ""

-#: clamav-milter.c:1340

+#: clamav-milter.c:1352

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1402

+#: clamav-milter.c:1414

 msgid "Starting clamav-milter"

 msgstr ""

-#: clamav-milter.c:1411

+#: clamav-milter.c:1423

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1413

+#: clamav-milter.c:1425

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1446

+#: clamav-milter.c:1459

 #, c-format

 msgid "%s: smfi_setconn failed\n"

 msgstr ""

-#: clamav-milter.c:1462

+#: clamav-milter.c:1475

 #, c-format

 msgid "Starting %s"

 msgstr ""

-#: clamav-milter.c:1465

+#: clamav-milter.c:1478

 msgid "Debugging is on"

 msgstr ""

-#: clamav-milter.c:1532 clamav-milter.c:1791

+#: clamav-milter.c:1545 clamav-milter.c:1804

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1537

+#: clamav-milter.c:1550

 msgid "Check clamd server - it may be down"

 msgstr ""

-#: clamav-milter.c:1712

+#: clamav-milter.c:1725

 msgid "No free clamd sessions\n"

 msgstr ""

-#: clamav-milter.c:1794

+#: clamav-milter.c:1807

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1800

+#: clamav-milter.c:1813

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

 msgstr ""

-#: clamav-milter.c:1836

+#: clamav-milter.c:1849

 msgid "findServer: select failed"

 msgstr ""

-#: clamav-milter.c:1845

+#: clamav-milter.c:1858

 #, c-format

 msgid "findServer: using server %d\n"

 msgstr ""

-#: clamav-milter.c:1850

+#: clamav-milter.c:1863

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

 msgstr ""

-#: clamav-milter.c:1852

+#: clamav-milter.c:1865

 msgid "findServer: No response from any server"

 msgstr ""

-#: clamav-milter.c:1890

+#: clamav-milter.c:1903

 msgid "clamfi_connect: ctx is null"

 msgstr ""

-#: clamav-milter.c:1895

+#: clamav-milter.c:1908

 msgid "clamfi_connect: hostname is null"

 msgstr ""

-#: clamav-milter.c:1916

+#: clamav-milter.c:1929

 msgid "clamfi_connect: remoteIP is null"

 msgstr ""

-#: clamav-milter.c:1925

+#: clamav-milter.c:1938

 #, c-format

 msgid "clamfi_connect: connection from %s"

 msgstr ""

-#: clamav-milter.c:1926

+#: clamav-milter.c:1939

 #, c-format

 msgid "clamfi_connect: connection from %s\n"

 msgstr ""

-#: clamav-milter.c:1929

+#: clamav-milter.c:1942

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1930

+#: clamav-milter.c:1943

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1950

+#: clamav-milter.c:1963

 msgid "Can't get sendmail hostname"

 msgstr ""

-#: clamav-milter.c:1959

+#: clamav-milter.c:1972

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1968

+#: clamav-milter.c:1981

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1979

+#: clamav-milter.c:1992

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1996

+#: clamav-milter.c:2009

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2014

+#: clamav-milter.c:2027

 msgid "clamfi_connect: not scanning outgoing messages"

 msgstr ""

-#: clamav-milter.c:2015

+#: clamav-milter.c:2028

 msgid "clamfi_connect: not scanning outgoing messages\n"

 msgstr ""

-#: clamav-milter.c:2023

+#: clamav-milter.c:2036

 msgid "clamfi_connect: not scanning local messages"

 msgstr ""

-#: clamav-milter.c:2024

+#: clamav-milter.c:2037

 msgid "clamfi_connect: not scanning local messages\n"

 msgstr ""

-#: clamav-milter.c:2038 clamav-milter.c:2161

+#: clamav-milter.c:2051 clamav-milter.c:2174

 msgid "clamfi_connect: gethostname failed"

 msgstr ""

-#: clamav-milter.c:2043

+#: clamav-milter.c:2056

 msgid "Rejected email falsely claiming to be from here"

 msgstr ""

-#: clamav-milter.c:2044

+#: clamav-milter.c:2057

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

 msgstr ""

-#: clamav-milter.c:2045 clamav-milter.c:2169

+#: clamav-milter.c:2058 clamav-milter.c:2182

 msgid "Forged local address detected"

 msgstr ""

-#: clamav-milter.c:2076

+#: clamav-milter.c:2089

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2077

+#: clamav-milter.c:2090

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2083

+#: clamav-milter.c:2096

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2084

+#: clamav-milter.c:2097

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2089

+#: clamav-milter.c:2102

 msgid "AV system temporarily overloaded - please try later"

 msgstr ""

-#: clamav-milter.c:2122

+#: clamav-milter.c:2135

 #, c-format

 msgid ">n_children = %d\n"

 msgstr ""

-#: clamav-milter.c:2128

+#: clamav-milter.c:2141

 msgid "Timeout waiting for a child to die"

 msgstr ""

-#: clamav-milter.c:2130

+#: clamav-milter.c:2143

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

 msgstr ""

-#: clamav-milter.c:2167

+#: clamav-milter.c:2180

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:2168

+#: clamav-milter.c:2181

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

 msgstr ""

-#: clamav-milter.c:2275

+#: clamav-milter.c:2288

 msgid "clamfi_eoh"

 msgstr ""

-#: clamav-milter.c:2278

+#: clamav-milter.c:2291

 msgid "clamfi_eoh\n"

 msgstr ""

-#: clamav-milter.c:2326

+#: clamav-milter.c:2339

 msgid "clamfi_eoh: ignoring whitelisted message"

 msgstr ""

-#: clamav-milter.c:2328

+#: clamav-milter.c:2341

 msgid "clamfi_eoh: ignoring whitelisted message\n"

 msgstr ""

-#: clamav-milter.c:2342

+#: clamav-milter.c:2355

 #, c-format

 msgid "clamfi_envbody: %u bytes"

 msgstr ""

-#: clamav-milter.c:2344

+#: clamav-milter.c:2357

 #, c-format

 msgid "clamfi_envbody: %u bytes\n"

 msgstr ""

-#: clamav-milter.c:2354 clamav-milter.c:2646

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

 #, c-format

 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"

 msgstr ""

-#: clamav-milter.c:2358 clamav-milter.c:2649

+#: clamav-milter.c:2371 clamav-milter.c:2662

 msgid "Not Scanned - StreamMaxLength exceeded"

 msgstr ""

-#: clamav-milter.c:2411

+#: clamav-milter.c:2424

 #, c-format

 msgid "Failed to delete X-Virus-Status header %d"

 msgstr ""

-#: clamav-milter.c:2472

+#: clamav-milter.c:2485

 #, c-format

 msgid "failed to send SCAN %s command to clamd"

 msgstr ""

-#: clamav-milter.c:2494

+#: clamav-milter.c:2507

 msgid "failed to send SCAN command to clamd"

 msgstr ""

-#: clamav-milter.c:2511

+#: clamav-milter.c:2524

 #, c-format

 msgid "Wating to read status from fd %d\n"

 msgstr ""

-#: clamav-milter.c:2524

+#: clamav-milter.c:2537

 #, c-format

 msgid "clamfi_eom: read %s"

 msgstr ""

-#: clamav-milter.c:2525

+#: clamav-milter.c:2538

 #, c-format

 msgid "clamfi_eom: read %s\n"

 msgstr ""

-#: clamav-milter.c:2542

+#: clamav-milter.c:2555

 #, c-format

 msgid "clamfi_eom: read nothing from clamd on %s"

 msgstr ""

-#: clamav-milter.c:2544

+#: clamav-milter.c:2557

 #, c-format

 msgid "clamfi_eom: read nothing from clamd on %s\n"

 msgstr ""

-#: clamav-milter.c:2589 clamav-milter.c:2635

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

 msgid "Error determining host"

 msgstr ""

-#: clamav-milter.c:2654

+#: clamav-milter.c:2667

 msgid "Not Scanned"

 msgstr ""

-#: clamav-milter.c:2683

+#: clamav-milter.c:2696

 msgid "Infected with"

 msgstr ""

-#: clamav-milter.c:2704

+#: clamav-milter.c:2717

 #, c-format

 msgid "Intercepted virus from %s to"

 msgstr ""

-#: clamav-milter.c:2805

+#: clamav-milter.c:2818

 msgid ""

 "Subject: Virus intercepted\n"

 "\n"

 msgstr ""

-#: clamav-milter.c:2827

+#: clamav-milter.c:2840

 msgid "A message you sent to\n"

 msgstr ""

-#: clamav-milter.c:2834

+#: clamav-milter.c:2847

 #, c-format

 msgid "The message %1$s sent from %2$s to\n"

 msgstr ""

-#: clamav-milter.c:2837

+#: clamav-milter.c:2850

 #, c-format

 msgid "A message sent from %s to\n"

 msgstr ""

-#: clamav-milter.c:2842

+#: clamav-milter.c:2855

 #, c-format

 msgid "contained %s and has not been delivered.\n"

 msgstr ""

-#: clamav-milter.c:2845

+#: clamav-milter.c:2858

 #, c-format

 msgid ""

 "\n"

 "The message in question has been quarantined as %s\n"

 msgstr ""

-#: clamav-milter.c:2848

+#: clamav-milter.c:2861

 #, c-format

 msgid ""

 "\n"

@@ -708,13 +713,13 @@ msgid ""

 "\n"

 msgstr ""

-#: clamav-milter.c:2851

+#: clamav-milter.c:2864

 msgid ""

 "For your information, the original message headers were:\n"

 "\n"

 msgstr ""

-#: clamav-milter.c:2864

+#: clamav-milter.c:2877

 #, c-format

 msgid ""

 "\n"

@@ -722,240 +727,240 @@ msgid ""

 "%s\t\n"

 msgstr ""

-#: clamav-milter.c:2872

+#: clamav-milter.c:2885

 #, c-format

 msgid "Can't execute '%s' to send virus notice"

 msgstr ""

-#: clamav-milter.c:2877

+#: clamav-milter.c:2890

 #, c-format

 msgid "Quarantined infected mail as %s"

 msgstr ""

-#: clamav-milter.c:2901

+#: clamav-milter.c:2914

 #, c-format

 msgid "Can't set quarantine user %s"

 msgstr ""

-#: clamav-milter.c:2903

+#: clamav-milter.c:2916

 #, c-format

 msgid "Can't set quarantine user %s\n"

 msgstr ""

-#: clamav-milter.c:2928

+#: clamav-milter.c:2941

 #, c-format

 msgid "virus %s detected by ClamAV - http://www.clamav.net"

 msgstr ""

-#: clamav-milter.c:2933

+#: clamav-milter.c:2946

 msgid "Unknown"

 msgstr ""

-#: clamav-milter.c:2935

+#: clamav-milter.c:2948

 #, c-format

 msgid "%s: incorrect message \"%s\" from clamd"

 msgstr ""

-#: clamav-milter.c:2941

+#: clamav-milter.c:2954

 msgid "Clean"

 msgstr ""

-#: clamav-milter.c:2945

+#: clamav-milter.c:2958

 #, c-format

 msgid "%s: clean message from %s"

 msgstr ""

-#: clamav-milter.c:2947

+#: clamav-milter.c:2960

 msgid "an unknown sender"

 msgstr ""

-#: clamav-milter.c:3051

+#: clamav-milter.c:3064

 #, c-format

 msgid "Can't remove clean file %s"

 msgstr ""

-#: clamav-milter.c:3230 clamav-milter.c:3233

+#: clamav-milter.c:3243 clamav-milter.c:3246

 #, c-format

 msgid "write failure (%u bytes) to %s: %s"

 msgstr ""

-#: clamav-milter.c:3247 clamav-milter.c:3250

+#: clamav-milter.c:3260 clamav-milter.c:3263

 #, c-format

 msgid "write failure (%u bytes) to clamd: %s"

 msgstr ""

-#: clamav-milter.c:3316

+#: clamav-milter.c:3329

 #, c-format

 msgid "No data received from clamd in %d seconds\n"

 msgstr ""

-#: clamav-milter.c:3338

+#: clamav-milter.c:3351

 #, c-format

 msgid "Can't stat %s"

 msgstr ""

-#: clamav-milter.c:3349 clamav-milter.c:3775

+#: clamav-milter.c:3362 clamav-milter.c:3788

 #, c-format

 msgid "Can't open %s"

 msgstr ""

-#: clamav-milter.c:3468 clamav-milter.c:3939

+#: clamav-milter.c:3481 clamav-milter.c:3952

 #, c-format

 msgid "mkdir %s failed"

 msgstr ""

-#: clamav-milter.c:3480

+#: clamav-milter.c:3493

 #, c-format

 msgid "mktemp %s failed"

 msgstr ""

-#: clamav-milter.c:3490

+#: clamav-milter.c:3503

 #, c-format

 msgid "Temporary quarantine file %s creation failed"

 msgstr ""

-#: clamav-milter.c:3594

+#: clamav-milter.c:3607

 #, c-format

 msgid "failed to send STREAM command clamd server %d"

 msgstr ""

-#: clamav-milter.c:3603

+#: clamav-milter.c:3616

 msgid "failed to send STREAM command clamd"

 msgstr ""