Browse code
Ensure that the quarantine location reported in notifications is correct
| ... | ... |
@@ -1,3 +1,9 @@ |
| 1 |
+Sun Apr 23 13:58:31 BST 2006 (njh) |
|
| 2 |
+---------------------------------- |
|
| 3 |
+ * clamav-milter: Ensure that the quarantine location reported in |
|
| 4 |
+ notifications is correct. Patch by |
|
| 5 |
+ Simon Munton <simon at nidoran.m5data.com> |
|
| 6 |
+ |
|
| 1 | 7 |
Fri Apr 21 14:28:43 CEST 2006 (tk) |
| 2 | 8 |
---------------------------------- |
| 3 | 9 |
* libclamav/readdb.c: load *.hdb, *.fp, *.zmd and *.rmd in hwaccel mode |
| ... | ... |
@@ -23,9 +23,9 @@ |
| 23 | 23 |
* |
| 24 | 24 |
* For installation instructions see the file INSTALL that came with this file |
| 25 | 25 |
*/ |
| 26 |
-static char const rcsid[] = "$Id: clamav-milter.c,v 1.235 2006/04/09 19:59:25 kojm Exp $"; |
|
| 26 |
+static char const rcsid[] = "$Id: clamav-milter.c,v 1.236 2006/04/23 13:00:49 nigelhorne Exp $"; |
|
| 27 | 27 |
|
| 28 |
-#define CM_VERSION "devel-090206" |
|
| 28 |
+#define CM_VERSION "devel-230406" |
|
| 29 | 29 |
|
| 30 | 30 |
#if HAVE_CONFIG_H |
| 31 | 31 |
#include "clamav-config.h" |
| ... | ... |
@@ -2921,6 +2921,9 @@ clamfi_eom(SMFICTX *ctx) |
| 2921 | 2921 |
smfi_addheader(ctx, "X-Virus-Status", buf); |
| 2922 | 2922 |
} |
| 2923 | 2923 |
|
| 2924 |
+ if(quarantine_dir) |
|
| 2925 |
+ qfile(privdata, sendmailId, virusname); |
|
| 2926 |
+ |
|
| 2924 | 2927 |
if(use_syslog) {
|
| 2925 | 2928 |
/* |
| 2926 | 2929 |
* Setup err as a list of recipients |
| ... | ... |
@@ -3126,8 +3129,6 @@ clamfi_eom(SMFICTX *ctx) |
| 3126 | 3126 |
} |
| 3127 | 3127 |
|
| 3128 | 3128 |
if(quarantine_dir) {
|
| 3129 |
- qfile(privdata, sendmailId, virusname); |
|
| 3130 |
- |
|
| 3131 | 3129 |
/* |
| 3132 | 3130 |
* Cleanup filename here otherwise clamfi_free() will |
| 3133 | 3131 |
* delete the file that we wish to keep because it |