Subversion Repositories

#!/bin/sh /usr/share/dpatch/dpatch-run

## 41_none_not_neutral.dpatch by Robert Millan <rmh@aybabtu.com>, edited by Magnus Holmgren

##

## DP: Differentiate between SPF_RESULT_NONE and

## DP: SPF_RESULT_NEUTRAL in the header comment.

@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

@@ -214,11 +226,15 @@

 		break;

 	case SPF_RESULT_NEUTRAL:

-	case SPF_RESULT_NONE:

 		snprintf( p, p_end - p, "%s is neither permitted nor denied by %s",

 				  ip, spf_source );

 		break;

+	case SPF_RESULT_NONE:

+		snprintf( p, p_end - p, "%s does not provide an SPF record",

+				  spf_source );

+		break;

+

 	case SPF_RESULT_TEMPERROR:

 		snprintf( p, p_end - p, "encountered temporary error during SPF processing of %s",

 				  spf_source );

diff -ur libspf2-1.2.5.dfsg.old/src/libspf2/spf_result.c libspf2-1.2.5.dfsg/src/libspf2/spf_result.c

--- libspf2-1.2.5.dfsg.old/src/libspf2/spf_result.c	2004-08-10 15:04:02.000000000 +0200

+++ libspf2-1.2.5.dfsg/src/libspf2/spf_result.c	2007-07-01 01:03:29.000000000 +0200

@@ -187,11 +197,15 @@

 	break;

     case SPF_RESULT_NEUTRAL:

-    case SPF_RESULT_NONE:

 	snprintf( p, p_end - p, "%s is neither permitted nor denied by %s",

 		  ip, spf_source );

 	break;

+    case SPF_RESULT_NONE:

+	snprintf( p, p_end - p, "%s does not provide an SPF record",

+		  spf_source );

+	break;

+

     case SPF_RESULT_ERROR:

 	snprintf( p, p_end - p, "encountered temporary error during SPF processing of %s",

 		  spf_source );