@@ -1,3 +1,9 @@

+Mon Oct  4 13:38:23 BST 2004 (njh)

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

+  * clamav-milter:	Fix mails containing viruses being kept twice in

+				quarantine; once as 'msg.xxxxxx' and once as

+				'msg.xxxxxx.virusname'

+

 Mon Oct  4 13:20:17 BST 2004 (njh)

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

   * libclamav:		More informative message when scanning PGP encoded

@@ -513,6 +513,8 @@ Changes

 			set to the orginator's address

 0.80f	2/10/04	Fix crash if %h is used in a template and --headers is not set

 0.80g	4/10/04	Enhanced the SMTP reply

+0.80h	4/10/04	Fix mails containing viruses being kept twice in quarantine;

+			once as 'msg.xxxxxx' and once as 'msg.xxxxxx.virusname'

 INTERNATIONALISATION

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

  *

  * Change History:

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

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

  *

@@ -425,9 +428,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.138 2004/10/04 10:53:58 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.139 2004/10/04 12:37:11 nigelhorne Exp $";

-#define	CM_VERSION	"0.80g"

+#define	CM_VERSION	"0.80h"

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

@@ -3696,6 +3699,7 @@ qfile(struct privdata *privdata, const char *virusname)

 		free(newname);

 		return -1;

 	}

+	unlink(privdata->filename);

 	free(privdata->filename);

 	privdata->filename = newname;