________________________________________________________________
--- amavisd Mon Sep 27 18:47:15 2004 +++ amavisd Mon Sep 27 18:47:15 2004 @@ -11848,9 +11848,10 @@ Date: %d From: %f Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED]|VIRUS (%V)]# IN MAIL TO YOU (from [?%o|(?)|<%o>]) To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] Message-ID: <[EMAIL PROTECTED]> +X-Original-From: %s %o
[? %#V |[? %#F ||BANNED CONTENTS ALERT]|VIRUS ALERT]
@@ -11792,7 +11792,8 @@
Date: %d
From: %f
Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED (%F)]|VIRUS (%V)]#
FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>]
To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]]
[? %#C |#|Cc: [<%C>|, ]]
Message-ID: <[EMAIL PROTECTED]>
+X-Original-From: %s %o
@@ -11720,5 +11720,6 @@
Subject: [? %#V |[? %#F |Unknown problem|BANNED (%F)]|VIRUS (%V)] IN MAIL FROM YOU
[? %m |#|In-Reply-To: %m]
Message-ID: <[EMAIL PROTECTED]>
+X-Original-From: %s %o
[? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED CONTENTS ALERT]|VIRUS ALERT]
@@ -6817,4 +6817,6 @@
if ($first) { # insert headers required for the new cluster
if ($do_tag_virus_checked) {
$hdr_edits->append_header(c('X_HEADER_TAG'), c('X_HEADER_LINE'));
+ $hdr_edits->append_header(c('X_HEADER2_TAG'), c('X_HEADER2_LINE'));
}
@@ -934,4 +934,7 @@
$X_HEADER_TAG = 'X-Virus-Scanned' if !defined $X_HEADER_TAG;
$X_HEADER_LINE = "by amavisd-new at $mydomain" if !defined $X_HEADER_LINE;
+ $X_HEADER2_TAG = 'X-Spam-Scanned' if !defined $X_HEADER2_TAG;
+ $X_HEADER2_LINE = "by SpamAssassin at $mydomain" if !defined $X_HEADER2_LINE;
+
@@ -184,5 +184,5 @@
$localpart_is_case_sensitive
$recipient_delimiter $replace_existing_extension
$hdr_encoding $bdy_encoding $hdr_encoding_qb
- $notify_xmailer_header $X_HEADER_TAG $X_HEADER_LINE
+ $notify_xmailer_header $X_HEADER_TAG $X_HEADER_LINE $X_HEADER2_TAG $X_HEADER2_LINE
$remove_existing_x_scanned_headers $remove_existing_spam_headers
________________________________________________________________
Move the patch file to the folder that contains the amavisd executable and 'cd' there.
to apply the patch:
patch < amavisd-212.patch
For the lazy man, you can download the patch file at http://www.daleenterprise.com/tools/downloads/amavisd-212.patch.tar.gz
It may work for 2.1.1 provided that the templates have basically stated the same but this has been untested.
-- Dale
NOTE:
http://www.daleenterprise.com/tools/
I'm putting together a a page or two of mods for amavis-new and clamav so if you'd like to submit something the format is very simple.
I'm going this route until I find a better solution and will update the groups when a better solution becomes present or I write something.
</tr>
<tr class="center">
<td class="e">Description of code ~ <a href="YOUR E-MAIL?subject=DESCRIPTION [Q]">ask author</a> </td>
</tr>
<tr>
<td class="v"><pre>
YOUR CODE GOES HERE
</td>
</tr>
So, if you have a useful little tidbit that improves the tool, consider submitting it for others can benefit from it.
if you wish to submit one just click here mailto:[EMAIL PROTECTED]
------------------------------------------------------- This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170 Project Admins to receive an Apple iPod Mini FREE for your judgement on who ports your project to Linux PPC the best. Sponsored by IBM. Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php _______________________________________________ Clamav-users mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/clamav-users
