Hello everyone,

courier 0.47 will create a "Received-SPF" Header of every message if SPF checking is enabled in {COURIER_CONFIG_DIR}/bofh.
It will *always* rename existing "Received-SPF" Headers to "Old-Received-SPF".

I think this renaming should only take place, if courier does SPF checking on its own, not if SPF checking is disabled.

We use a mailserver setup, where one "external" mail server receives all mail for "ourdomain.com" and routes it to an internal mail hub which *can* do no SPF checking. The internal mail hub should leave the "Received-SPF" headers generated by the external mailserver intact instead of renaming them (this makes them useable for spam filtering).

The attachment contains a small patch for courier/submit.C that will only do renaming if SPF checking is enabled, maybe it could be incorporated into courier-mta.

--
        juergen walch

__________________________________________________________________

plumsoft systemhaus gmbh
roritzerstr. 12 d-93047 regensburg
fon +49-941-7979777 fax +49-941-7994421

PGP 0x2A077751 - 123D 3FF1 BF2B 373B E3C3 7F6E 5802 C5CA 2A07 7751
--- courier/submit.C.orig       Fri Sep  3 03:48:28 2004
+++ courier/submit.C    Wed Nov  3 19:21:29 2004
@@ -1554,9 +1555,16 @@

                // Quote Return-Path:'s at this point

-               if (headername == "return-path" ||
-                   (headername == "received-spf" &&
-                    mf->helohost.GetLength() > 0))
+               if (headername == "return-path")
+                       headernameorig="Old-"+headernameorig;
+
+               // Rename Received-SPF only if own SPF checking is done
+
+               if (headername == "received-spf" &&
+                    (mf->helohost.GetLength() > 0) &&
+                    !(bofh_checkspf("BOFHSPFHELO", "off", "off") &&
+                      bofh_checkspf("BOFHSPFMAILFROM", "off", "off") &&
+                      bofh_checkspf("BOFHSPFFROM", "off", "off")))
                        headernameorig="Old-"+headernameorig;

                my_rcptinfo.submitfile.Message(headernameorig);

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to