From 52b0ac9377404aa992767445bbae2e5d42b9772e Mon Sep 17 00:00:00 2001
From: Stuart Gathman <stuart@gathman.org>
Date: Fri, 23 Dec 2005 22:34:46 +0000
Subject: [PATCH] Put guessed result in separate header.

---
 TODO   | 4 ----
 bms.py | 8 ++++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index a4c0c4f..2fc4168 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,3 @@
-Include full info in Received-SPF for neutral.  When making best
-guess, Received-SPF should be none.  Add additional keywords or
-another header.
-
 Require signed MFROM for all incoming bounces when signing all outgoing mail -
 except from trusted relays.
 
diff --git a/bms.py b/bms.py
index 153c7eb..7955f2b 100644
--- a/bms.py
+++ b/bms.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # A simple milter that has grown quite a bit.
 # $Log$
+# Revision 1.44  2005/12/23 21:47:07  customdesigned
+# Move Received-SPF header to top.
+#
 # Revision 1.43  2005/12/09 16:54:01  customdesigned
 # Select neutral DSN template for best_guess
 #
@@ -1012,7 +1015,6 @@ class bmsMilter(Milter.Milter):
 	  res,code,txt = q.best_guess('v=spf1 a/24 mx/24')
 	else:
 	  res,code,txt = q.best_guess()
-	receiver += ': guessing'
         if q.perm_error:	# FIXME: should never happen?
           res,code,txt = q.perm_error.ext	# extended result
 	  txt = 'EXT: ' + txt
@@ -1094,7 +1096,9 @@ class bmsMilter(Milter.Milter):
       self.log('TEMPFAIL: SPF %s %i %s' % (res,code,txt))
       self.setreply(str(code),'4.3.0',txt)
       return Milter.TEMPFAIL
-    self.add_header('Received-SPF',q.get_header(res,receiver),0)
+    self.add_header('Received-SPF',q.get_header(q.result,receiver),0)
+    if res != q.result:
+      self.add_header('X-Guessed-SPF',res,0)
     self.spf = q
     if res == 'pass' and auto_whitelist.has_key(self.canon_from):
       self.whitelist = True