Rev 8 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 8 | Rev 27 | ||
---|---|---|---|
1 | #!/bin/sh /usr/share/dpatch/dpatch-run |
1 | #!/bin/sh /usr/share/dpatch/dpatch-run |
2 | ## 41_none_not_neutral.dpatch by Robert Millan <rmh@aybabtu.com>, edited by Magnus Holmgren |
2 | ## 41_none_not_neutral.dpatch by Robert Millan <rmh@aybabtu.com>, edited by Magnus Holmgren |
3 | ## |
3 | ## |
4 | ## DP: Differentiate between SPF_RESULT_NONE and |
4 | ## DP: Differentiate between SPF_RESULT_NONE and |
5 | ## DP: SPF_RESULT_NEUTRAL in the header comment. |
5 | ## DP: SPF_RESULT_NEUTRAL in the header comment. |
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 | @@ -214,11 +226,15 @@ |
12 | @@ -214,11 +226,15 @@ |
13 | break; |
13 | break; |
14 | 14 | ||
15 | case SPF_RESULT_NEUTRAL: |
15 | case SPF_RESULT_NEUTRAL: |
16 | - case SPF_RESULT_NONE: |
16 | - case SPF_RESULT_NONE: |
17 | snprintf( p, p_end - p, "%s is neither permitted nor denied by %s", |
17 | snprintf( p, p_end - p, "%s is neither permitted nor denied by %s", |
18 | ip, spf_source ); |
18 | ip, spf_source ); |
19 | break; |
19 | break; |
20 | 20 | ||
21 | + case SPF_RESULT_NONE: |
21 | + case SPF_RESULT_NONE: |
22 | + snprintf( p, p_end - p, "%s does not provide an SPF record", |
22 | + snprintf( p, p_end - p, "%s does not provide an SPF record", |
23 | + spf_source ); |
23 | + spf_source ); |
24 | + break; |
24 | + break; |
25 | + |
25 | + |
26 | case SPF_RESULT_TEMPERROR: |
26 | case SPF_RESULT_TEMPERROR: |
27 | snprintf( p, p_end - p, "encountered temporary error during SPF processing of %s", |
27 | snprintf( p, p_end - p, "encountered temporary error during SPF processing of %s", |
28 | spf_source ); |
28 | spf_source ); |
29 | diff -ur libspf2-1.2.5.dfsg.old/src/libspf2/spf_result.c libspf2-1.2.5.dfsg/src/libspf2/spf_result.c |
29 | diff -ur libspf2-1.2.5.dfsg.old/src/libspf2/spf_result.c libspf2-1.2.5.dfsg/src/libspf2/spf_result.c |
30 | --- libspf2-1.2.5.dfsg.old/src/libspf2/spf_result.c 2004-08-10 15:04:02.000000000 +0200 |
30 | --- libspf2-1.2.5.dfsg.old/src/libspf2/spf_result.c 2004-08-10 15:04:02.000000000 +0200 |
31 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_result.c 2007-07-01 01:03:29.000000000 +0200 |
31 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_result.c 2007-07-01 01:03:29.000000000 +0200 |
32 | @@ -187,11 +197,15 @@ |
32 | @@ -187,11 +197,15 @@ |
33 | break; |
33 | break; |
34 | 34 | ||
35 | case SPF_RESULT_NEUTRAL: |
35 | case SPF_RESULT_NEUTRAL: |
36 | - case SPF_RESULT_NONE: |
36 | - case SPF_RESULT_NONE: |
37 | snprintf( p, p_end - p, "%s is neither permitted nor denied by %s", |
37 | snprintf( p, p_end - p, "%s is neither permitted nor denied by %s", |
38 | ip, spf_source ); |
38 | ip, spf_source ); |
39 | break; |
39 | break; |
40 | 40 | ||
41 | + case SPF_RESULT_NONE: |
41 | + case SPF_RESULT_NONE: |
42 | + snprintf( p, p_end - p, "%s does not provide an SPF record", |
42 | + snprintf( p, p_end - p, "%s does not provide an SPF record", |
43 | + spf_source ); |
43 | + spf_source ); |
44 | + break; |
44 | + break; |
45 | + |
45 | + |
46 | case SPF_RESULT_ERROR: |
46 | case SPF_RESULT_ERROR: |
47 | snprintf( p, p_end - p, "encountered temporary error during SPF processing of %s", |
47 | snprintf( p, p_end - p, "encountered temporary error during SPF processing of %s", |
48 | spf_source ); |
48 | spf_source ); |