Bugfixes; implement test program for DNS API.

* lib/dns.c (ptr_lookup): Reverse IP octets prior to look up.
Use adns_r_ptr_raw to disable consistency checks.
(ptr_validate): Return values in struct dns_reply.
All uses changed.
* lib/dns.h (ptr_validate): Change signature.

* tests/resolv.c: New test program.
* tests/Makefile.am: Add resolv.c
* tests/.gitignore: Update.

2 files changed, 26 insertions, 28 deletions

diff --git a/src/builtin/dns.bi b/src/builtin/dns.bi
index f63a2361..4bde9676 100644
--- a/src/builtin/dns.bi
+++ b/src/builtin/dns.bi
@@ -171,6 +171,6 @@ MF_DEFUN(getmx, STRING, STRING domain, OPTIONAL, NUMBER no_resolve)
 	mf_status mxstat;
-	struct dns_reply repl;
+	struct dns_reply reply;
 
 	if (MF_OPTVAL(no_resolve)) {
-		mxstat = getmxip(domain, &repl);
+		mxstat = getmxip(domain, &reply);
 		if (!mf_resolved(mxstat)) {
@@ -185,5 +185,5 @@ MF_DEFUN(getmx, STRING, STRING domain, OPTIONAL, NUMBER no_resolve)
 			MF_OBSTACK_BEGIN();
-			for (i = 0; i < repl.count; i++) {
+			for (i = 0; i < reply.count; i++) {
 				struct in_addr s;
-				s.s_addr = htonl(repl.data.ip[i]);
+				s.s_addr = htonl(reply.data.ip[i]);
 				
@@ -194,3 +194,3 @@ MF_DEFUN(getmx, STRING, STRING domain, OPTIONAL, NUMBER no_resolve)
 			MF_OBSTACK_1GROW(0);
-			dns_reply_free(&repl);
+			dns_reply_free(&reply);
 			MF_RETURN_OBSTACK();
@@ -198,3 +198,3 @@ MF_DEFUN(getmx, STRING, STRING domain, OPTIONAL, NUMBER no_resolve)
 	} else {
-		mxstat = getmx(domain, &repl);
+		mxstat = getmx(domain, &reply);
 		if (!mf_resolved(mxstat)) {
@@ -209,9 +209,9 @@ MF_DEFUN(getmx, STRING, STRING domain, OPTIONAL, NUMBER no_resolve)
 			MF_OBSTACK_BEGIN();
-			for (i = 0; i < repl.count; i++) {
+			for (i = 0; i < reply.count; i++) {
 				if (i > 0)
 					MF_OBSTACK_1GROW(' ');
-				MF_OBSTACK_GROW(repl.data.str[i]);
+				MF_OBSTACK_GROW(reply.data.str[i]);
 			}
 			MF_OBSTACK_1GROW(0);
-			dns_reply_free(&repl);
+			dns_reply_free(&reply);
 			MF_RETURN_OBSTACK();
@@ -288,3 +288,3 @@ MF_DEFUN(ptr_validate, NUMBER, STRING s)
 	int rc, res;
-	switch (rc = ptr_validate(s, NULL, NULL)) {
+	switch (rc = ptr_validate(s, NULL)) {
 	case dns_success:
diff --git a/src/spf.c b/src/spf.c
index 0b570a04..87a158a9 100644
--- a/src/spf.c
+++ b/src/spf.c
@@ -336,6 +336,4 @@ spf_expand_do(struct spf_data *dat, int allow_exp, const char **pptr)
 		char *name = NULL;
-		char **vnames;
-		size_t vcount;
-		dns_status status = ptr_validate(dat->q.ipstr,
-						 &vnames, &vcount);
+		struct dns_reply reply;
+		dns_status status = ptr_validate(dat->q.ipstr, &reply);
 		if (status != dns_success)
@@ -343,5 +341,5 @@ spf_expand_do(struct spf_data *dat, int allow_exp, const char **pptr)
 
-		for (i = 0; i < vcount; i++)
-			if (strcasecmp(vnames[i], dat->q.domain) == 0) {
-				name = vnames[i];
+		for (i = 0; i < reply.count; i++)
+			if (strcasecmp(reply.data.str[i], dat->q.domain) == 0) {
+				name = reply.data.str[i];
 				break;
@@ -350,5 +348,6 @@ spf_expand_do(struct spf_data *dat, int allow_exp, const char **pptr)
 		if (!name) {
-			for (i = 0; i < vcount; i++)
-				if (domain_match(vnames[i], dat->q.domain)) {
-					name = vnames[i]; 
+			for (i = 0; i < reply.count; i++)
+				if (domain_match(reply.data.str[i],
+						 dat->q.domain)) {
+					name = reply.data.str[i]; 
 					break;
@@ -357,3 +356,3 @@ spf_expand_do(struct spf_data *dat, int allow_exp, const char **pptr)
 			if (!name)
-				name = vnames[0];
+				name = reply.data.str[0];
 		}
@@ -361,3 +360,3 @@ spf_expand_do(struct spf_data *dat, int allow_exp, const char **pptr)
 		rc = spf_transform(dat, name, 0, pptr);
-		mu_argcv_free(vcount, vnames);
+		dns_reply_free(&reply);
 		return rc;
@@ -700,4 +699,3 @@ mech_ptr(spf_data *dat, spf_term_arg *arg, unsigned long masklen)
 {
-	char **vnames;
-	size_t vcount;
+	struct dns_reply reply;
 	size_t i;
@@ -711,6 +709,6 @@ mech_ptr(spf_data *dat, spf_term_arg *arg, unsigned long masklen)
 	
-	DNS_CATCH(ptr_validate(dat->q.ipstr, &vnames, &vcount));
+	DNS_CATCH(ptr_validate(dat->q.ipstr, &reply));
 	
-	for (i = 0; i < vcount; i++)
-		if (domain_match(vnames[i], domain_spec)) {
+	for (i = 0; i < reply.count; i++)
+		if (domain_match(reply.data.str[i], domain_spec)) {
 			result = spf_term_match;
@@ -718,3 +716,3 @@ mech_ptr(spf_data *dat, spf_term_arg *arg, unsigned long masklen)
 		}
-	mu_argcv_free(vcount, vnames);
+	dns_reply_free(&reply);
 	return result;