]>
Commit | Line | Data |
---|---|---|
819739d2 AM |
1 | Author: Magnus Holmgren <holmgren@debian.org> |
2 | Description: Include arpa/nameser.h and netdb.h from spf_dns.h | |
3 | instead of defining the constants needed unless certain HAVE_ macros are defined. | |
4 | Updated for libspf2 1.2.8/9 by Scott Kitterman <scott@kitterman.com> | |
5 | ||
6 | --- libspf2-1.2.9~/src/include/spf_dns.h 2008-10-27 12:27:14.000000000 -0400 | |
7 | +++ libspf2-1.2.9/src/include/spf_dns.h 2008-11-04 10:10:58.000000000 -0500 | |
8 | @@ -63,48 +63,19 @@ | |
9 | * | |
10 | */ | |
11 | ||
12 | +/* The following two header files might not exist on all platforms, | |
13 | + * but at least they exist on Debian with libc6. | |
14 | + */ | |
15 | +#include <arpa/nameser.h> | |
16 | +#include <netdb.h> | |
17 | ||
18 | /* | |
19 | - * For those who don't have <arpa/nameserv.h> | |
20 | + * Type 99 decl does not exist in Debian libc6 (not even 2.7) | |
21 | */ | |
22 | - | |
23 | -/* XXX This should use a more sensible define. */ | |
24 | -#if !defined( HAVE_NS_TYPE ) | |
25 | - | |
26 | -#define ns_t_invalid 0 | |
27 | -#define ns_t_a 1 | |
28 | -#define ns_t_ns 2 | |
29 | -#define ns_t_cname 5 | |
30 | -#define ns_t_ptr 12 | |
31 | -#define ns_t_mx 15 | |
32 | -#define ns_t_txt 16 | |
33 | -#define ns_t_aaaa 28 | |
34 | -/* #define ns_t_a6 38 */ | |
35 | -#define ns_t_any 255 /**< Wildcard match. */ | |
36 | - | |
37 | -typedef int ns_type; | |
38 | -#endif | |
39 | - | |
40 | #if ! HAVE_DECL_NS_T_SPF | |
41 | #define ns_t_spf 99 | |
42 | #endif | |
43 | ||
44 | -#if ! HAVE_DECL_NS_T_INVALID | |
45 | -#define ns_t_invalid 0 | |
46 | -#endif | |
47 | - | |
48 | - | |
49 | -/* | |
50 | - * For those who don't have <netdb.h> | |
51 | - */ | |
52 | - | |
53 | -#if !defined(HAVE_NETDB_H) && !defined(_WIN32) | |
54 | -#define NETDB_SUCCESS 0 | |
55 | -#define HOST_NOT_FOUND 1 /**< NXDOMAIN (authoritative answer)*/ | |
56 | -#define TRY_AGAIN 2 /**< SERVFAIL (no authoritative answer)*/ | |
57 | -#define NO_RECOVERY 3 /**< invalid/unimplmeneted query */ | |
58 | -#define NO_DATA 4 /**< host found, but no RR of req type*/ | |
59 | -#endif | |
60 | typedef int SPF_dns_stat_t; | |
61 | ||
62 | typedef struct SPF_dns_server_struct SPF_dns_server_t; |