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

+Mon Feb  2 13:46:51 GMT 2004 (njh)

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

+  * clamav-milter: Include the ID of the message when warnings are sent to

+  	postmaster-only

+

 Mon Feb  2 12:43:55 GMT 2004 (trog)

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

   * libclamav: ole2_extract.c: Add checks for compiler packed struct

@@ -213,6 +213,11 @@ Changes

 0.66i	28/1/04	Fixed compilation error with --enable-debug

 0.66j	29/1/03	Added --noreject flag, based on a patch by

 		"Vijay Sarvepalli" <vssarvep@office.uncg.edu>

+0.66k	2/2/04	When --postmaster-only is given, include the system

+		ID of the message in the warning e-mail, since that

+		will help the administrator when sifting through the

+		mail logs. Based on an idea by Jim Allen,

+		<Jim.Allen@Heartsine.co.uk>

 BUG REPORTS

@@ -216,9 +216,17 @@

  *	0.66i	28/1/04	Fixed compilation error with --enable-debug

  *	0.66j	29/1/03	Added --noreject flag, based on a patch by

  *			"Vijay Sarvepalli" <vssarvep@office.uncg.edu>

+ *	0.66k	2/2/04	When --postmaster-only is given, include the system

+ *			ID of the message in the warning e-mail, since that

+ *			will help the administrator when sifting through the

+ *			mail logs. Based on an idea by Jim Allen,

+ *			<Jim.Allen@Heartsine.co.uk>

  *

  * Change History:

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

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

  *

@@ -327,9 +335,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.41 2004/01/29 12:52:35 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.42 2004/02/02 13:44:31 nigelhorne Exp $";

-#define	CM_VERSION	"0.66j"

+#define	CM_VERSION	"0.66k"

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

@@ -1868,7 +1876,17 @@ clamfi_eom(SMFICTX *ctx)

 				if(bflag)

 					fputs("A message you sent to\n\t", sendmail);

+				else if(pflag)

+					/*

+					 * The message is only going to the

+					 * postmaster, so include some useful

+					 * information

+					 */

+					fprintf(sendmail, "The message %s sent from %s to\n\t",

+						smfi_getsymval(ctx, "i"),

+						privdata->from);

 				else

+

 					fprintf(sendmail, "A message sent from %s to\n\t", privdata->from);

 				for(to = privdata->to; *to; to++)

@@ -37,7 +37,8 @@ suite.

 \fB\-b, \-\-bounce\fR

 Send a failure message to the sender, and to the postmaster.

 [ \fBWarning\fR: most viruses and worms

-fake their source address, so this option is not recommended ]

+fake their source address, so this option is not recommended ].

+See also \-\-noreject.

 .TP

 \fB-d, \-\-dont-scan-on-error\fR

 If a system error occurs pass messages through unscanned,

@@ -54,17 +55,26 @@ Also scan messages sent from LAN.

 Usually clamav\-milter adds a heading to messages that are scanned.

 The header is of the form "X-Virus-Scanned: version", this option instructs

 clamav\-milter to refrain from adding this heading.

+.TP

+\fB-N, \-\-noreject\R

+When clamav\-milter processes an e-mail which contains a virus it rejects

+the e-mail by using the SMTP code 550. This option causes clamav\-milter to

+silently discard such messages. It is recommended that systems administrators

+use this option when NOT using the \-\-bounce option.

 .TP 

 \fB-o, \-\-outgoing\fR

 Scan outgoing messages from this machine.

 .TP

 \fB-p, \-\-postmaster=EMAILADDRESS\fR

-Sets the e-mail address to send notifications to when the \-\-bounce or

-\-\-postmaster-only option is given [ Default: postmaster ]

+Sets the e-mail address to send notifications to when the \-\-quiet option

+is not given.

 .TP

 \fB-P, \-\-postmaster-only\fR

 When the \-\-bounce option is given, only send a notification to the postmaster,

 not the sender.

+Setting this flag will include the ID of the message which can ease searching

+through system logs if the administrator believes it is a locally sourced

+virus.

 .TP

 \fB-q, \-\-quiet\fR

 Don't send any warning messages when a virus or worm or is detected.