From 25b8d879d9ea87bbd6cfb11fe4ae88ecfefdffc8 Mon Sep 17 00:00:00 2001
From: ps <ps@805f7146-951d-0410-87ab-a7c6d0b5165e>
Date: Tue, 16 Aug 2011 12:21:37 +0000
Subject: [PATCH] add spf-fail to the headers

---
 src/Proxy.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Proxy.cpp b/src/Proxy.cpp
index 79416ac..f311d49 100644
--- a/src/Proxy.cpp
+++ b/src/Proxy.cpp
@@ -139,15 +139,19 @@ void Proxy::run(string &peer_address)
             code="421";
             mechanism="greylist";
             message=code+" Greylisted!! Please try again in a few minutes.";
-	    LINF("checking " + mechanism);
+            LINF("checking " + mechanism);
           }
           #ifdef HAVE_SPF
           else if(cfg.getQuerySpf()&&!authenticated&&!spf_checker.query(peer_address,ehlostr,from))
           {
-            code=cfg.getReturnTempErrorOnReject()?"421":"550";
+            hermes_status="spf-failed";
+            if(cfg.getAddStatusHeader())
+              code="250";
+            else
+              code=cfg.getReturnTempErrorOnReject()?"421":"550";
             mechanism="spf";
             message=code+" You do not seem to be allowed to send email for that particular domain.";
-	    LINF("checking " + mechanism);
+            LINF("checking " + mechanism);
           }
           #endif //HAVE_SPF
           //check blacklist
@@ -156,7 +160,7 @@ void Proxy::run(string &peer_address)
             code=cfg.getReturnTempErrorOnReject()?"421":"550";
             mechanism="allowed-domain-per-ip";
             message=code+" You do not seem to be allowed to send email to that particular domain from that address.";
-	    LINF("checking " + mechanism);
+            LINF("checking " + mechanism);
           }
           //check rbl
           else if(!cfg.getDnsBlacklistDomains().empty()&&!authenticated&&Utils::listed_on_dns_lists(cfg.getDnsBlacklistDomains(),cfg.getDnsBlacklistPercentage(),peer_address))
@@ -168,21 +172,21 @@ void Proxy::run(string &peer_address)
               code=cfg.getReturnTempErrorOnReject()?"421":"550";
             mechanism="dnsbl";
             message=code+" You are listed on some DNS blacklists. Get delisted before trying to send us email.";
-	    LINF("checking " + mechanism);
+            LINF("checking " + mechanism);
           }
           else if(cfg.getRejectNoReverseResolution()&&!authenticated&&""==resolvedname)
           {
             code=cfg.getReturnTempErrorOnReject()?"421":"550";
             mechanism="no reverse resolution";
             message=code+" Your IP address does not resolve to a hostname.";
-	    LINF("checking " + mechanism);
+            LINF("checking " + mechanism);
           }
           else if(cfg.getCheckHeloAgainstReverse()&&!authenticated&&ehlostr!=resolvedname)
           {
             code=cfg.getReturnTempErrorOnReject()?"421":"550";
             mechanism="helo differs from resolved name";
             message=code+" Your IP hostname doesn't match your envelope hostname.";
-	    LINF("checking " + mechanism);
+            LINF("checking " + mechanism);
           }
           else
             code="250";