@@ -1,3 +1,7 @@

+Thu Mar  3 09:22:57 GMT 2005 (njh)

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

+  * clamav-milter:	Up-issue

+

 Tue Mar  1 18:57:18 GMT 2005 (njh)

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

   * clamav-milter:	Improved database update detection when not --external

@@ -702,6 +702,7 @@ Changes

 				found, stop accepting inputs to quiten the

 				system for the database reload, rather than

 				wait for it to happen by itself

+0.84	3/3/05:		Up-issue

 INTERNATIONALISATION

@@ -23,550 +23,8 @@

  * See http://www.nmt.edu/~wcolburn/sendmail-8.12.5/libmilter/docs/sample.html

  *

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

- *

- * Change History:

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

- * Revision 1.185  2005/03/01 18:55:14  nigelhorne

- * Improved database update detection when not --external

- *

- * Revision 1.184  2005/02/23 09:41:39  nigelhorne

- * Remove the pidfile

- *

- * Revision 1.183  2005/02/13 20:50:15  nigelhorne

- * 0.83

- *

- * Revision 1.182  2005/02/11 22:15:24  nigelhorne

- * Added whitelist-file

- *

- * Revision 1.181  2005/02/08 12:05:28  nigelhorne

- * Tidy some code and debug statements

- *

- * Revision 1.180  2005/02/08 09:01:26  nigelhorne

- * Turn off SESSION mode

- *

- * Revision 1.179  2005/02/07 22:35:14  nigelhorne

- * Bug fix to detect-forged-email-address

- *

- * 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

- *

- * Revision 1.176  2005/02/02 08:30:24  nigelhorne

- * Call watchdog when neither SESSION not external is given

- *

- * Revision 1.175  2005/02/01 08:54:45  nigelhorne

- * X-Virus-Status work

- *

- * Revision 1.174  2005/01/30 15:16:30  nigelhorne

- * Enable SESSION by default

- *

- * Revision 1.173  2005/01/28 08:49:04  nigelhorne

- * Fixed --internal warnings that should refer to --external

- *

- * Revision 1.172  2005/01/27 10:54:27  nigelhorne

- * Don't scan emails to the quarantine e-mail address

- *

- * Revision 1.171  2005/01/25 08:10:45  nigelhorne

- * Change --internal to --external

- *

- * Revision 1.170  2005/01/22 13:44:09  nigelhorne

- * Fix --quarantine when --internal used

- *

- * Revision 1.169  2005/01/19 05:27:39  nigelhorne

- * Up issued

- *

- * Revision 1.168  2005/01/12 08:57:05  nigelhorne

- * Fix DNS error messages

- *

- * Revision 1.167  2004/12/21 22:39:04  nigelhorne

- * Tidy

- *

- * Revision 1.166  2004/12/21 18:40:38  nigelhorne

- * Fix fault tolerance problem

- *

- * Revision 1.165  2004/12/19 17:00:28  nigelhorne

- * Ensure --max-children > 0 in LocalSocket mode with SESSIONS

- *

- * Revision 1.164  2004/12/19 13:49:28  nigelhorne

- * Fix non SESSION compilation error

- *

- * Revision 1.163  2004/12/14 10:43:58  nigelhorne

- * Fix crash on BSD if DNS is incorrectly set up

- *

- * Revision 1.162  2004/12/13 11:17:15  nigelhorne

- * Handle cross file system quarantine

- *

- * Revision 1.161  2004/12/07 19:23:48  nigelhorne

- * Ensure that the qurantine daily directory is created

- *

- * Revision 1.160  2004/12/06 22:31:13  nigelhorne

- * Keep date in quarantine directory path

- *

- * Revision 1.159  2004/12/05 14:58:18  nigelhorne

- * Fix array overrun on startup

- *

- * Revision 1.158  2004/12/04 23:33:47  nigelhorne

- * Remove possible array overflow when looking for a free server

- *

- * Revision 1.157  2004/12/03 17:34:58  nigelhorne

- * internal: Honour scanning modes and archive limits

- *

- * 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

- *

- * Revision 1.154  2004/11/20 23:02:23  nigelhorne

- * Validate error message from clamd

- *

- * Revision 1.153  2004/11/14 15:18:49  nigelhorne

- * Use SCAN in more places rather than STREAM

- *

- * Revision 1.152  2004/11/12 16:48:57  nigelhorne

- * Use SCAN when in localSocket mode

- *

- * Revision 1.151  2004/11/08 20:40:34  nigelhorne

- * Typo

- *

- * Revision 1.150  2004/11/08 20:35:12  nigelhorne

- * Don't start watchdog monitor in localSocket mode

- *

- * Revision 1.149  2004/11/04 14:20:37  nigelhorne

- * Fix typo in error message

- *

- * Revision 1.148  2004/11/04 08:22:06  nigelhorne

- * Fix segfault on startup in LocalSocket mode

- *

- * Revision 1.147  2004/11/03 12:46:13  nigelhorne

- * Add X-Original-Subject

- *

- * Revision 1.146  2004/10/30 07:01:55  nigelhorne

- * Tidy

- *

- * Revision 1.145  2004/10/30 06:49:08  nigelhorne

- * Fix crash when a server can't be contacted

- *

- * Revision 1.144  2004/10/29 18:09:14  nigelhorne

- * Fix X-VIRUS-STATUS deletion

- *

- * Revision 1.143  2004/10/27 12:34:21  nigelhorne

- * Correct version header

- *

- * Revision 1.142  2004/10/24 03:49:47  nigelhorne

- * Enable SESSION code by default

- *

- * Revision 1.141  2004/10/09 22:10:08  nigelhorne

- * BINDTODEVICE fix was broken

- *

- * Revision 1.140  2004/10/07 15:36:43  nigelhorne

- * Remove scanmail requirement

- *

- * Revision 1.139  2004/10/04 12:37:11  nigelhorne

- * Fix quarantine files being saved twice

- *

- * Revision 1.138  2004/10/04 10:53:58  nigelhorne

- * Better SMTP message when virus is found

- *

- * Revision 1.137  2004/10/02 17:54:06  nigelhorne

- * Fix crash if %h is used in a template and --headers is not set

- *

- * Revision 1.136  2004/09/30 19:18:30  nigelhorne

- * Allow --from with no e-mail address

- *

- * Revision 1.135  2004/09/28 14:44:35  nigelhorne

- * Handle operating systems that don't support SO_BINDTODEVICE

- *

- * Revision 1.134  2004/09/27 17:08:31  nigelhorne

- * Add iface option to --broadcast

- *

- * Revision 1.133  2004/09/27 12:43:23  nigelhorne

- * Added --broadcast

- *

- * Revision 1.132  2004/09/25 15:47:19  nigelhorne

- * Honour LogFacility

- *

- * Revision 1.131  2004/09/20 12:46:05  nigelhorne

- * Up issued

- *

- * Revision 1.130  2004/09/20 09:09:23  nigelhorne

- * Update clamav.conf references

- *

- * Revision 1.129  2004/09/17 15:40:02  nigelhorne

- * Handle sendmail variables after clamav variables

- *

- * Revision 1.128  2004/09/15 08:46:33  nigelhorne

- * Added --max-children to --help

- *

- * Revision 1.127  2004/09/14 07:57:29  nigelhorne

- * Session code no longer needs all servers to be up on startup

- *

- * Revision 1.126  2004/09/13 21:46:30  nigelhorne

- * Session code tidy

- *

- * Revision 1.125  2004/09/13 17:39:31  nigelhorne

- * User pthread_cond_broadcast rather than pthread_cond_signal

- *

- * Revision 1.124  2004/09/13 13:14:34  nigelhorne

- * Updated SESSION Code

- *

- * Revision 1.123  2004/09/12 14:23:47  nigelhorne

- * Added SESSION Code

- *

- * Revision 1.122  2004/09/08 16:03:36  nigelhorne

- * i18n

- *

- * Revision 1.121  2004/08/26 10:22:00  nigelhorne

- * Fix overflow To:

- *

- * Revision 1.120  2004/08/25 11:44:56  nigelhorne

- * Tidy

- *

- * Revision 1.119  2004/08/13 10:21:38  nigelhorne

- * Single thread through tcp_wrappers

- *

- * Revision 1.118  2004/08/12 12:18:45  nigelhorne

- * Fixed from

- *

- * Revision 1.117  2004/08/11 10:34:07  nigelhorne

- * Better isLocal handler

- *

- * Revision 1.116  2004/08/07 13:10:33  nigelhorne

- * Better load balancing

- *

- * Revision 1.115  2004/08/06 10:08:31  nigelhorne

- * Quarantined files now include the virus in the name

- *

- * Revision 1.114  2004/08/05 07:44:28  nigelhorne

- * Better Template Handling

- *

- * Revision 1.113  2004/07/30 14:34:56  nigelhorne

- * Handle changed clamd message

- *

- * Revision 1.112  2004/07/29 15:24:47  nigelhorne

- * Don't say waiting for some to exit if dont_wait is set

- *

- * Revision 1.111  2004/07/29 06:38:05  nigelhorne

- * GETHOSTBYNAME_R_6

- *

- * Revision 1.110  2004/07/26 13:23:27  nigelhorne

- * Remove stream: from template %v

- *

- * Revision 1.109  2004/07/25 11:51:42  nigelhorne

- * Fix crash if 1st host dies

- *

- * Revision 1.108  2004/07/22 15:45:03  nigelhorne

- * Up-issue

- *

- * Revision 1.107  2004/07/22 09:14:32  nigelhorne

- * Use gethostbyname_r when available

- *

- * Revision 1.106  2004/07/21 21:23:29  nigelhorne

- * Mutex gethostbyname result

- *

- * Revision 1.105  2004/07/21 17:46:06  nigelhorne

- * Added note about needing MILTER support in sendmail

- *

- * Revision 1.104  2004/07/14 10:17:05  nigelhorne

- * Added dont-wait and advisory options

- *

- * Revision 1.103  2004/07/08 22:22:39  nigelhorne

- * Don't pass empty arguments to inet_ntop

- *

- * Revision 1.102  2004/06/29 15:26:14  nigelhorne

- * Support the --timeout argument

- *

- * Revision 1.101  2004/06/29 10:04:47  nigelhorne

- * Up issued

- *

- * Revision 1.100  2004/06/29 08:27:02  nigelhorne

- * Up issued

- *

- * Revision 1.99  2004/06/28 08:30:18  nigelhorne

- * Don't error when creating the quarantine directory if it already exists

- *

- * Revision 1.98  2004/06/22 04:09:12  nigelhorne

- * Avoid unlocking unlocked mutex in clamfi_abort

- *

- * Revision 1.97  2004/06/16 08:08:47  nigelhorne

- * Allow access to sendmail variables in the template file

- *

- * Revision 1.96  2004/06/14 14:34:15  nigelhorne

- * Added support for Windows SFU 3.5

- *

- * Revision 1.95  2004/06/14 09:05:49  nigelhorne

- * Up-issued

- *

- * Revision 1.94  2004/06/13 02:11:25  kojm

- * improve output

- *

- * Revision 1.93  2004/06/08 21:44:59  nigelhorne

- * Ensure --from takes an argument

- *

- * Revision 1.92  2004/06/03 13:14:08  nigelhorne

- * Up-issued

- *

- * Revision 1.91  2004/05/25 16:24:21  nigelhorne

- * X-Virus-Scanned wasn't being added in maxstreamlength was exceeded

- *

- * Revision 1.90  2004/05/24 17:05:18  nigelhorne

- * Include the hostname of the scanner in the headers

- *

- * Revision 1.89  2004/05/21 09:14:57  nigelhorne

- * Handle --from, print error message if write to quarantine fails

- *

- * Revision 1.88  2004/05/16 08:25:09  nigelhorne

- * Up issue

- *

- * Revision 1.87  2004/05/09 17:39:04  nigelhorne

- * Waiting threads weren't being woken up

- *

- * Revision 1.86  2004/05/06 11:25:20  nigelhorne

- * Some work on maxStreamLength

- *

- * Revision 1.85  2004/04/29 07:35:27  nigelhorne

- * Change from realloc to cli_realloc - keep assignment

- *

- * Revision 1.84  2004/04/28 14:28:29  nigelhorne

- * Various updates

- *

- * Revision 1.83  2004/04/25 12:56:35  nigelhorne

- * Added --pidfile

- *

- * Revision 1.82  2004/04/23 09:13:30  nigelhorne

- * Better quarantine email subject

- *

- * Revision 1.81  2004/04/22 16:47:04  nigelhorne

- * Various changes

- *

- * Revision 1.80  2004/04/21 15:27:02  nigelhorne

- * Various changes

- *

- * Revision 1.79  2004/04/20 14:15:01  nigelhorne

- * Sorted out X- headers and handle hostaddr == NULL

- *

- * Revision 1.78  2004/04/20 08:13:15  nigelhorne

- * Print better message if hostaddr is null

- *

- * Revision 1.77  2004/04/19 22:11:20  nigelhorne

- * Many changes

- *

- * Revision 1.76  2004/04/19 13:28:41  nigelhorne

- * Started coding e-mail template support

- *

- * Revision 1.75  2004/04/19 13:28:00  nigelhorne

- * Started coding e-mail template support

- *

- * Revision 1.74  2004/04/17 20:39:04  nigelhorne

- * Add the virus name into the 550 rejection if sent

- *

- * Revision 1.73  2004/04/15 09:53:25  nigelhorne

- * Handle systems without inet_ntop

- *

- * Revision 1.72  2004/04/09 08:36:53  nigelhorne

- * Handle clamd giving up on StreamMaxLength before clamav-milter

- *

- * Revision 1.71  2004/04/08 13:14:07  nigelhorne

- * Code tidy up

- *

- * Revision 1.70  2004/04/06 22:43:43  kojm

- * reverse strlcpy/strlcat patch

- *

- * Revision 1.69  2004/04/06 12:14:52  kojm

- * use strlcpy/strlcat

- *

- * Revision 1.68  2004/04/03 04:47:22  nigelhorne

- * Honour StreamMaxLength

- *

- * Revision 1.67  2004/04/01 15:34:00  nigelhorne

- * ThreadTimeout has been renamed ReadTimeout

- *

- * Revision 1.66  2004/03/31 20:48:03  nigelhorne

- * Config file has changed

- *

- * Revision 1.65  2004/03/27 21:44:21  nigelhorne

- * Attempt to handle clamd quick timeout for slow remote sites

- *

- * Revision 1.64  2004/03/26 11:10:27  nigelhorne

- * Added debug information

- *

- * Revision 1.63  2004/03/20 12:30:00  nigelhorne

- * strerror_r is confused on Linux

- *

- * Revision 1.62  2004/03/17 19:46:49  nigelhorne

- * Upissue to 0.70@

- *

- * Revision 1.61  2004/03/15 19:54:12  kojm

- * 0.70-rc

- *

- * Revision 1.60  2004/03/10 11:31:03  nigelhorne

- * Use HAVE_STRERROR_R

- *

- * Revision 1.59  2004/03/07 15:11:15  nigelhorne

- * Added more information to headers flag

- *

- * Revision 1.58  2004/03/03 09:14:55  nigelhorne

- * Change way check for TCPwrappers on TCP/IP

- *

- * Revision 1.57  2004/02/27 15:27:11  nigelhorne

- * call checkClamd on start

- *

- * Revision 1.56  2004/02/27 09:23:56  nigelhorne

- * Don't use TCP wrappers when UNIX domain sockets are used

- *

- * Revision 1.55  2004/02/22 22:53:50  nigelhorne

- * Handle ERROR message from clamd

- *

- * Revision 1.54  2004/02/22 17:27:40  nigelhorne

- * Updated installation instructions now that privileges are dropped

- *

- * Revision 1.53  2004/02/21 11:03:23  nigelhorne

- * Error if quarantine-dir is publically accessable

- *

- * Revision 1.52  2004/02/20 17:07:24  nigelhorne

- * Added checkClamd

- *

- * Revision 1.51  2004/02/20 09:50:42  nigelhorne

- * Removed warnings added by new configuration script

- *

- * Revision 1.50  2004/02/19 10:00:26  nigelhorne

- * Rework TCPWrappers support

- *

- * Revision 1.49  2004/02/18 13:30:34  nigelhorne

- * Added dont-long-clean argument

- *

- * Revision 1.48  2004/02/18 10:06:51  nigelhorne

- * Fix FreeBSD

- *

- * Revision 1.47  2004/02/16 11:55:24  nigelhorne

- * Added clamfi_free which helps with the tidying up

- *

- * Revision 1.46  2004/02/16 09:39:22  nigelhorne

- * Upissued to 0.67

- *

- * Revision 1.45  2004/02/14 17:20:38  nigelhorne

- * Add TCPwrappers support

- *

- * Revision 1.44  2004/02/09 11:05:33  nigelhorne

- * Added Hflag

- *

- * Revision 1.43  2004/02/07 12:16:20  nigelhorne

- * Added config.h

- *

- * Revision 1.42  2004/02/02 13:44:31  nigelhorne

- * Include the ID of the message when warnings are sent to the postmaster-only

- *

- * Revision 1.41  2004/01/29 12:52:35  nigelhorne

- * Added --noreject flag

- *

- * Revision 1.40  2004/01/28 15:55:59  nigelhorne

- * Fixed compilation error with --enable-debug

- *

- * Revision 1.39  2004/01/26 14:12:42  nigelhorne

- * Corrected endian problem (ntohs instead of htons)

- *

- * Revision 1.38  2004/01/25 14:23:51  nigelhorne

- * Support multiple clamd servers

- *

- * Revision 1.37  2004/01/24 18:09:39  nigelhorne

- * Allow clamd server name as well as IPaddress in -s option

- *

- * Revision 1.36  2004/01/12 15:30:53  nigelhorne

- * FixStaleSocket no longer complains on ENOENT

- *

- * Revision 1.35  2004/01/10 16:22:14  nigelhorne

- * Added OpenBSD instructions and --signature-file

- *

- * Revision 1.34  2003/12/31 14:46:35  nigelhorne

- * Include the sendmail queue ID in the log

- *

- * Revision 1.33  2003/12/27 17:28:56  nigelhorne

- * Moved --sign data to private area

- *

- * Revision 1.32  2003/12/22 14:05:31  nigelhorne

- * Added --sign option

- *

- * Revision 1.31  2003/12/13 16:43:21  nigelhorne

- * Upissue

- *

- * Revision 1.30  2003/12/12 13:42:47  nigelhorne

- * alls to clamfi_cleanup were missing

- *

- * Revision 1.29  2003/12/10 12:00:39  nigelhorne

- * Timeout on waiting for data from clamd

- *

- * Revision 1.28  2003/12/09 09:22:14  nigelhorne

- * Use the location of sendmail discovered by configure

- *

- * Revision 1.27  2003/12/05 19:14:07  nigelhorne

- * Set umask; handle unescaped From in mailboxes

- *

- * Revision 1.26  2003/12/02 06:37:26  nigelhorne

- * Use setsid if setpgrp not present

- *

- * Revision 1.25  2003/11/30 06:12:06  nigelhorne

- * Added --quarantine-dir option

- *

- * Revision 1.24  2003/11/29 11:51:19  nigelhorne

- * Fix problem of possible confused pointers if large number of recipients given

- *

- * Revision 1.23  2003/11/25 05:56:43  nigelhorne

- * Handle empty hostname or hostaddr

- *

- * Revision 1.22  2003/11/24 04:48:44  nigelhorne

- * Support AllowSupplementaryGroups

- *

- * Revision 1.21  2003/11/22 11:47:45  nigelhorne

- * Drop root priviliges and support quarantine

- *

- * Revision 1.20  2003/11/19 16:32:22  nigelhorne

- * Close cmdSocket earlier

- *

- * Revision 1.19  2003/11/17 04:48:30  nigelhorne

- * Up issue to version 0.65

- *

- * Revision 1.18  2003/11/11 08:19:20  nigelhorne

- * Handle % characters in e-mail addresses

- *

- * Revision 1.17  2003/11/05 15:41:11  nigelhorne

- * Tidyup pthread_cond_timewait call

- *

- * Revision 1.16  2003/10/31 13:33:40  nigelhorne

- * Added dont scan on error flag

- *

- * Revision 1.15  2003/10/22 19:44:01  nigelhorne

- * more calls to pthread_cond_broadcast

- *

- * Revision 1.14  2003/10/12 08:37:21  nigelhorne

- * Uses VERSION command to get version information

- *

- * Revision 1.13  2003/10/11 15:42:15  nigelhorne

- * Don't call clamdscan

- *

- * Revision 1.12  2003/10/05 17:30:04  nigelhorne

- * Only fix old socket when FixStaleSocket is set

- *

- * Revision 1.11  2003/10/05 13:57:47  nigelhorne

- * Fixed handling of MaxThreads

- *

- * Revision 1.10  2003/10/03 11:54:53  nigelhorne

- * Added white list of recipients

- *

- * Revision 1.9  2003/09/30 11:53:55  nigelhorne

- * clamfi_envfrom was returning EX_TEMPFAIL in some places rather than SMFIS_TEMPFAIL

- *

- * Revision 1.8  2003/09/29 06:20:17  nigelhorne

- * max_children now overrides MaxThreads

- *

- * Revision 1.7  2003/09/29 06:07:49  nigelhorne

- * Ensure remoteIP is set before usage

- *

- * 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.185 2005/03/01 18:55:14 nigelhorne Exp $";

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

 #define	CM_VERSION	"0.83b"

@@ -668,7 +126,7 @@ typedef	unsigned int	in_addr_t;

 #define	VERSION_LENGTH	128

-#define	SESSION	/*

+/*#define	SESSION	/*

 		 * Keep one command connection open to clamd, otherwise a new

 		 * command connection is created for each new email

 		 *

@@ -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-23 09:40+0000\n"

+"POT-Creation-Date: 2005-03-03 09:21+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,689 +16,691 @@ msgstr ""

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

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

-#: clamav-milter.c:982

+#: clamav-milter.c:449

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

 msgstr ""

-#: clamav-milter.c:983

+#: clamav-milter.c:450

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

 msgstr ""

-#: clamav-milter.c:984

+#: clamav-milter.c:451

 msgid ""

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

 "found."

 msgstr ""

-#: clamav-milter.c:985

+#: clamav-milter.c:452

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

 msgstr ""

-#: clamav-milter.c:986

+#: clamav-milter.c:453

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

 msgstr ""

-#: clamav-milter.c:987

+#: clamav-milter.c:454

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:988

+#: clamav-milter.c:455

 msgid ""

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

 msgstr ""

-#: clamav-milter.c:989

+#: clamav-milter.c:456

 msgid ""

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

 "occurs."

 msgstr ""

-#: clamav-milter.c:990

+#: clamav-milter.c:457

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

 msgstr ""

-#: clamav-milter.c:991

+#: clamav-milter.c:458

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

 msgstr ""

-#: clamav-milter.c:992

+#: clamav-milter.c:459

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

 msgstr ""

-#: clamav-milter.c:993

+#: clamav-milter.c:460

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

 msgstr ""

-#: clamav-milter.c:994

+#: clamav-milter.c:461

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

 msgstr ""

-#: clamav-milter.c:995

+#: clamav-milter.c:462

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

 msgstr ""

-#: clamav-milter.c:996

+#: clamav-milter.c:463

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

 msgstr ""

-#: clamav-milter.c:997

+#: clamav-milter.c:464

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

 msgstr ""

-#: clamav-milter.c:998

+#: clamav-milter.c:465

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

 msgstr ""

-#: clamav-milter.c:999

+#: clamav-milter.c:466

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

 msgstr ""

-#: clamav-milter.c:1000

+#: clamav-milter.c:467

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

 msgstr ""

-#: clamav-milter.c:1001

+#: clamav-milter.c:468

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

 msgstr ""

-#: clamav-milter.c:1002

+#: clamav-milter.c:469

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

 msgstr ""

-#: clamav-milter.c:1003

+#: clamav-milter.c:470

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

 msgstr ""

-#: clamav-milter.c:1004

+#: clamav-milter.c:471

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

 msgstr ""

-#: clamav-milter.c:1005

+#: clamav-milter.c:472

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

 msgstr ""

-#: clamav-milter.c:1006

+#: clamav-milter.c:473

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

 msgstr ""

-#: clamav-milter.c:1007

+#: clamav-milter.c:474

 msgid ""

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

 "clamd (when using TCPsocket)."

 msgstr ""

-#: clamav-milter.c:1008

+#: clamav-milter.c:475

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

 msgstr ""

-#: clamav-milter.c:1009

+#: clamav-milter.c:476

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

 msgstr ""

-#: clamav-milter.c:1010

+#: clamav-milter.c:477

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

 msgstr ""

-#: clamav-milter.c:1011

+#: clamav-milter.c:478

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

 msgstr ""

-#: clamav-milter.c:1012

+#: clamav-milter.c:479

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

 msgstr ""

-#: clamav-milter.c:1013

+#: clamav-milter.c:480

 msgid ""

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

 "addresses"

 msgstr ""

-#: clamav-milter.c:1014

+#: clamav-milter.c:481

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

 msgstr ""

-#: clamav-milter.c:1016

+#: clamav-milter.c:483

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

 msgstr ""

-#: clamav-milter.c:1018

+#: clamav-milter.c:485

 msgid ""

 "\n"

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

 msgstr ""

-#: clamav-milter.c:1019

+#: clamav-milter.c:486

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

 msgstr ""

-#: clamav-milter.c:1329

+#: clamav-milter.c:796

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1335

+#: clamav-milter.c:802

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1343

+#: clamav-milter.c:810

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1350

+#: clamav-milter.c:817

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1354

+#: clamav-milter.c:821

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1358

+#: clamav-milter.c:825

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1397

+#: clamav-milter.c:864

 #, c-format

 msgid ""

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

 "system\n"

 msgstr ""

-#: clamav-milter.c:1406

+#: clamav-milter.c:873

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1417

+#: clamav-milter.c:884

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1434

+#: clamav-milter.c:901

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1437

+#: clamav-milter.c:904

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1439

+#: clamav-milter.c:906

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1444

+#: clamav-milter.c:911

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1452

+#: clamav-milter.c:919

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1458

+#: clamav-milter.c:925

 #, c-format

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

 msgstr ""

-#: clamav-milter.c:1464

+#: clamav-milter.c:931

 #, c-format

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

 msgstr ""