head 1.3; access; symbols OPENPKG_E1_MP_HEAD:1.1 OPENPKG_E1_MP:1.1 OPENPKG_E1_MP_2_STABLE:1.1 OPENPKG_E1_FP:1.1 OPENPKG_2_STABLE_MP:1.1 OPENPKG_2_STABLE_20061018:1.1 OPENPKG_2_STABLE_20060622:1.1 OPENPKG_2_STABLE:1.1.0.2 OPENPKG_2_STABLE_BP:1.1; locks; strict; comment @# @; 1.3 date 2008.11.05.08.12.56; author rse; state Exp; branches; next 1.2; commitid jGRcId48ZdaQFopt; 1.2 date 2008.10.16.07.06.04; author rse; state Exp; branches; next 1.1; commitid R2NdAJvOrn5KWOmt; 1.1 date 2005.11.14.18.53.00; author rse; state Exp; branches; next ; commitid tvJb0RLy6sYH9L9r; desc @@ 1.3 log @upgrading package: libspf2 1.2.8 -> 1.2.9 @ text @Index: src/libspf2/spf_dns_resolv.c --- src/libspf2/spf_dns_resolv.c.orig 2008-10-27 17:26:06 +0100 +++ src/libspf2/spf_dns_resolv.c 2008-11-05 09:08:02 +0100 @@@@ -94,7 +94,7 @@@@ { #if HAVE_DECL_RES_NDESTROY res_ndestroy( (struct __res_state *)arg ); -#else +#elif defined(HAVE_DECL_RES_NINIT) res_nclose( (struct __res_state *)arg ); #endif free(arg); @@@@ -265,6 +265,10 @@@@ else { res_state = (struct __res_state *)res_spec; } +#else + if (res_init() != 0) { + SPF_error("Failed to call res_init()"); + } #endif responselen = 2048; Index: src/libspf2/spf_request.c --- src/libspf2/spf_request.c.orig 2008-11-03 21:34:14 +0100 +++ src/libspf2/spf_request.c 2008-11-05 09:06:48 +0100 @@@@ -347,6 +347,9 @@@@ char *record; size_t len; + if ( (spf_request == NULL) || (rcpt_to == NULL) ) + return SPF_E_INVALID_OPT; + SPF_ASSERT_NOTNULL(spf_request); spf_server = spf_request->spf_server; SPF_ASSERT_NOTNULL(spf_server); Index: src/libspf2/spf_response.c --- src/libspf2/spf_response.c.orig 2008-09-27 23:34:37 +0200 +++ src/libspf2/spf_response.c 2008-11-05 09:06:48 +0100 @@@@ -134,6 +134,8 @@@@ SPF_result_t SPF_response_result(SPF_response_t *rp) { + if (rp == NULL) + return SPF_RESULT_NONE; return rp->result; } @ 1.2 log @upgrading package: libspf2 1.2.5 -> 1.2.8 @ text @d2 3 a4 5 --- src/libspf2/spf_dns_resolv.c.orig 2008-10-16 00:02:03 +0200 +++ src/libspf2/spf_dns_resolv.c 2008-10-16 09:01:02 +0200 @@@@ -92,7 +92,9 @@@@ static void SPF_dns_resolv_thread_term(void *arg) d6 4 a9 1 +#if HAVE_DECL_RES_NINIT d11 1 a11 1 +#endif d13 1 a13 3 } @@@@ -258,6 +260,10 @@@@ a23 12 Index: src/libspf2/spf_dns_rr.c --- src/libspf2/spf_dns_rr.c.orig 2008-10-07 01:12:05 +0200 +++ src/libspf2/spf_dns_rr.c 2008-10-16 08:57:18 +0200 @@@@ -54,7 +54,7 @@@@ const char *domain) { return SPF_dns_rr_new_init(spf_dns_server, - domain, ns_t_any, 0, NXDOMAIN); + domain, ns_t_any, 0, HOST_NOT_FOUND); } SPF_dns_rr_t * d25 3 a27 3 --- src/libspf2/spf_request.c.orig 2008-10-16 00:25:54 +0200 +++ src/libspf2/spf_request.c 2008-10-16 08:57:18 +0200 @@@@ -345,6 +345,9 @@@@ d39 1 a39 1 +++ src/libspf2/spf_response.c 2008-10-16 08:57:18 +0200 @ 1.1 log @upgrading package: libspf2 1.0.4 -> 1.2.5 @ text @a0 11 Index: src/include/spf_server.h --- src/include/spf_server.h.orig 2004-09-29 12:33:09 +0200 +++ src/include/spf_server.h 2005-11-14 19:44:48 +0100 @@@@ -20,7 +20,6 @@@@ #include "spf_record.h" #include "spf_dns.h" -#include "spf_dns_internal.h" #ifndef SPF_MAX_DNS_MECH /* It is a bad idea to change this for two reasons. d2 3 a4 3 --- src/libspf2/spf_dns_resolv.c.orig 2005-02-19 03:38:12 +0100 +++ src/libspf2/spf_dns_resolv.c 2005-11-14 19:47:02 +0100 @@@@ -77,7 +77,9 @@@@ d14 4 a17 8 @@@@ -144,9 +146,15 @@@@ if (res_spec == NULL) { res_state = (struct __res_state *) malloc(sizeof(struct __res_state)); +#if HAVE_DECL_RES_NINIT if (res_ninit(res_state) != 0) { SPF_error("Failed to call res_ninit()"); } d19 6 a24 7 + if (res_init() != 0) { + SPF_error("Failed to call res_init()"); + } +#endif pthread_setspecific(res_state_key, (void *)res_state); } else { d26 3 a28 3 --- src/libspf2/spf_dns_rr.c.orig 2005-02-22 02:42:34 +0100 +++ src/libspf2/spf_dns_rr.c 2005-11-14 19:48:05 +0100 @@@@ -45,7 +45,7 @@@@ d38 3 a40 3 --- src/libspf2/spf_request.c.orig 2005-02-22 03:38:57 +0100 +++ src/libspf2/spf_request.c 2005-11-14 19:48:36 +0100 @@@@ -307,6 +307,9 @@@@ d51 3 a53 3 --- src/libspf2/spf_response.c.orig 2004-10-19 16:05:19 +0200 +++ src/libspf2/spf_response.c 2005-11-14 19:49:14 +0100 @@@@ -132,6 +132,8 @@@@ a61 12 Index: src/spfquery/spfquery.c --- src/spfquery/spfquery.c.orig 2005-02-22 03:36:55 +0100 +++ src/spfquery/spfquery.c 2005-11-14 19:49:41 +0100 @@@@ -261,7 +261,7 @@@@ response_print_errors(const char *context, SPF_response_t *spf_response, SPF_errcode_t err) { - SPF_error_t *spf_error;; + SPF_error_t *spf_error; int i; printf("StartError\n"); @