SPF: better buld compatibility with OpenBSD

(cherry picked from commit bda76da8a9357f4fc525b5f8b925fae262c28010)
(cherry picked from commit 804219086fe9afbc1429c309e339524aaaabcec1)
(cherry picked from commit c26e27d5b81ed5640c00ee87f1d4287fb066dc12)

diff --git a/src/src/lookups/spf.c b/src/src/lookups/spf.c
index b32a73e6a9f549b6ce3a56cf9e48eda0a28d7b57..48d6ce3b5887d242d25212d68c4355db4d4e5c74 100644 (file)
--- a/src/src/lookups/spf.c
+++ b/src/src/lookups/spf.c
@@ -25,8 +25,8 @@ static void dummy(int x) { dummy2(x-1); }
 #else
 
 #include "lf_functions.h"
 #else
 
 #include "lf_functions.h"

-#ifndef HAVE_NS_TYPE
-#define HAVE_NS_TYPE
+#if !defined(HAVE_NS_TYPE) && defined(NS_INADDRSZ)
+# define HAVE_NS_TYPE

 #endif
 #include <spf2/spf.h>
 #include <spf2/spf_dns_resolv.h>
 #endif
 #include <spf2/spf.h>
 #include <spf2/spf_dns_resolv.h>

diff --git a/src/src/spf.h b/src/src/spf.h
index 23ad325f17b854bc1a452545754cad72355ea132..a0779f87cff8a730082093a94d9a402aa0048515 100644 (file)
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -11,7 +11,7 @@
 #ifdef SUPPORT_SPF
 
 /* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */
 #ifdef SUPPORT_SPF
 
 /* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */

-#ifndef HAVE_NS_TYPE
+#if !defined(HAVE_NS_TYPE) && defined(NS_INADDRSZ)

 # define HAVE_NS_TYPE
 #endif
 #include <spf2/spf.h>
 # define HAVE_NS_TYPE
 #endif
 #include <spf2/spf.h>