revno: 202
committer: Bastian Blank <bastian.blank@credativ.de>
branch nick: pypolicyd-spf
timestamp: Mon 2015-02-16 11:11:11 +0100
message:
  Add correct message to cached result
diff:
=== modified file 'policyd-spf'
--- policyd-spf	2015-02-16 10:08:58 +0000
+++ policyd-spf	2015-02-16 10:11:11 +0000
@@ -493,8 +493,8 @@
                             else:
                                 return(( 'dunno', 'Header already pre-pended', instance_dict ))
                 if helo_result[3] in ('reject', 'defer'): # It may not anymore
-                    header = _rejectmessage(helo_result, 'helo', helo, ip, data.get('recipient'))
-                    return(( helo_result[3], header, instance_dict ))
+                    helo_result[4] = _rejectmessage(helo_result, 'helo', helo, ip, data.get('recipient'))
+                    return(( helo_result[3], helo_result[4], instance_dict ))
         # Second do Mail From Check
         if sender == '':
             if configData.get('HELO_reject') != 'No_Check':
@@ -582,8 +582,8 @@
                             else:
                                 return(( 'dunno', 'Header already pre-pended', instance_dict ))
                 if mfrom_result[3] in ('reject', 'defer'): # It may not anymore
-                    header = _rejectmessage(mfrom_result, 'mfrom', sender, ip, data.get('recipient'))
-                    return(( mfrom_result[3], header, instance_dict ))
+                    mfrom_result[4] = _rejectmessage(mfrom_result, 'mfrom', sender, ip, data.get('recipient'))
+                    return(( mfrom_result[3], mfrom_result[4], instance_dict ))
                 if mfrom_result[3] != 'dunno' or helo_result[3] =='dunno':
                     if last_action != 'prepend':
                         return(( 'prepend', header, instance_dict ))