New Feature: adding X-Spam-DCC Header from SpamAssassin

[Herbert Straub]

I create a patch, which adds the X-Spam-DCC from SpamAssassin.

Details:
Add in /etc/spamassassin/local.cf the following lines:
use_dcc 1
dcc_add_header 1

Now SpamAssassin adding the following Header (you can see it with spamassassin <
mail)
X-Spam-DCC: xmailer: fcfw02 1192; Body=1 Fuz1=1

Spamass-milter does'nt add this headerline. With the following patch it does. I
take the current cvs version (from Thuesday):


diff -u spamass-milter-0.2.0hs1/spamass-milter.cpp 
spamass-milter-0.2.0hs2/spamass-milter.cpp
--- spamass-milter-0.2.0hs1/spamass-milter.cpp  Thu Aug 26 20:01:35 2004
+++ spamass-milter-0.2.0hs2/spamass-milter.cpp  Fri Sep  3 09:47:35 2004
@@ -547,6 +547,7 @@
   update_or_insert(assassin, ctx, assassin->spam_prev_content_type(),
&SpamAssassin::set_spam_prev_content_type, "X-Spam-Prev-Content-Type");
   update_or_insert(assassin, ctx, assassin->spam_level(),
&SpamAssassin::set_spam_level, "X-Spam-Level");
   update_or_insert(assassin, ctx, assassin->spam_checker_version(),
&SpamAssassin::set_spam_checker_version, "X-Spam-Checker-Version");
+  update_or_insert(assassin, ctx, assassin->spam_dcc(),
&SpamAssassin::set_spam_dcc, "X-Spam-DCC");

   //
   // If SpamAssassin thinks it is spam, replace
@@ -1002,6 +1003,8 @@
        assassin->set_spam_level(headerv);
       else if ( cmp_nocase_partial("X-Spam-Checker-Version", headerf) == 0 )
        assassin->set_spam_checker_version(headerv);
+      else if ( cmp_nocase_partial("X-Spam-DCC", headerf) == 0 )
+       assassin->set_spam_dcc(headerv);
       else
       {
        /* Hm. X-Spam header, but not one we recognize.  Pass it through. */
@@ -1565,6 +1568,12 @@
   return x_spam_level;
 }

+string&
+SpamAssassin::spam_dcc()
+{
+  return x_spam_dcc;
+}
+
 string&
 SpamAssassin::content_type()
 {
@@ -1694,6 +1703,14 @@
 {
   string::size_type old = x_spam_level.size();
   x_spam_level = val;
+  return (old);
+}
+
+string::size_type
+SpamAssassin::set_spam_dcc(const string& val)
+{
+  string::size_type old = x_spam_dcc.size();
+  x_spam_dcc = val;
   return (old);
 }



Regards Herbert Straub