Rev 29 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 29 | Rev 36 | ||
---|---|---|---|
1 | #!/bin/sh /usr/share/dpatch/dpatch-run |
1 | #!/bin/sh /usr/share/dpatch/dpatch-run |
2 | ## 40_permanent_include_errors.dpatch by Robert Millan <rmh@aybabtu.com>, edited by Magnus Holmgren |
2 | ## 40_permanent_include_errors.dpatch by Robert Millan <rmh@aybabtu.com>, edited by Magnus Holmgren |
3 | ## |
3 | ## |
4 | ## DP: Permanent error when processing an include: directive should in turn |
4 | ## DP: Permanent error when processing an include: directive should in turn |
5 | ## DP: produce permanent error (see the table in RFC 4408 / section 5.2). |
5 | ## DP: produce permanent error (see the table in RFC 4408 / section 5.2). |
6 | 6 | ||
7 | @DPATCH@ |
7 | @DPATCH@ |
8 | 8 | ||
9 | diff -ur libspf2-1.2.5.dfsg.old/src/libspf2/spf_interpret.c libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c |
9 | diff -ur libspf2-1.2.5.dfsg.old/src/libspf2/spf_interpret.c libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c |
10 | --- libspf2-1.2.5.dfsg.old/src/libspf2/spf_interpret.c 2005-02-22 04:41:27.000000000 +0100 |
10 | --- libspf2-1.2.5.dfsg.old/src/libspf2/spf_interpret.c 2005-02-22 04:41:27.000000000 +0100 |
11 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c 2007-07-01 01:03:17.000000000 +0200 |
11 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c 2007-07-01 01:03:17.000000000 +0200 |
12 | @@ -1022,7 +1042,10 @@ |
12 | @@ -1022,7 +1042,10 @@ |
13 | if (spf_record_subr) |
13 | if (spf_record_subr) |
14 | SPF_record_free(spf_record_subr); |
14 | SPF_record_free(spf_record_subr); |
15 | SPF_FREE_LOOKUP_DATA(); |
15 | SPF_FREE_LOOKUP_DATA(); |
16 | - return DONE_TEMPERR( err ); |
16 | - return DONE_TEMPERR( err ); |
17 | + if (err == SPF_E_DNS_ERROR) |
17 | + if (err == SPF_E_DNS_ERROR) |
18 | + return DONE_TEMPERR( err ); |
18 | + return DONE_TEMPERR( err ); |
19 | + else |
19 | + else |
20 | + return DONE_PERMERR( err ); |
20 | + return DONE_PERMERR( err ); |
21 | } |
21 | } |
22 | 22 | ||
23 | /* |
23 | /* |