Subversion Repositories

?revision_form?Rev ?revision_input??revision_submit??revision_endform?

Rev 7 | Blame | Compare with Previous | Last modification | View Log | RSS feed

#!/bin/sh /usr/share/dpatch/dpatch-run
## 40_permanent_include_errors.dpatch by Robert Millan <rmh@aybabtu.com>, edited by Magnus Holmgren
##
## DP: Permanent error when processing an include: directive should in turn
## DP: produce permanent error (see the table in RFC 4408 / section 5.2).

@DPATCH@

diff -ur libspf2-1.2.5.dfsg.old/src/libspf2/spf_interpret.c libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c
--- libspf2-1.2.5.dfsg.old/src/libspf2/spf_interpret.c  2005-02-22 04:41:27.000000000 +0100
+++ libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c      2007-07-01 01:03:17.000000000 +0200
@@ -1022,7 +1042,10 @@
                                if (spf_record_subr)
                                        SPF_record_free(spf_record_subr);
                                SPF_FREE_LOOKUP_DATA();
-                               return DONE_TEMPERR( err );
+                               if (err == SPF_E_DNS_ERROR)
+                                       return DONE_TEMPERR( err );
+                               else
+                                       return DONE_PERMERR( err );
                        }
 
                        /*