From bf7b486ffef68c52301e3e069e1156d0a942addb Mon Sep 17 00:00:00 2001
From: Richard Aas <richard@db.org>
Date: Fri, 19 Nov 2010 07:49:20 +0000
Subject: [PATCH] fix get_resolve_dns bug

---
 src/dns/res.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/dns/res.c b/src/dns/res.c
index 960795b..27bca14 100644
--- a/src/dns/res.c
+++ b/src/dns/res.c
@@ -37,17 +37,20 @@ int get_resolv_dns(char *domain, size_t dsize, struct sa *nsv, uint32_t *n)
 	else if (_res.defdname)
 		str_ncpy(domain, _res.defdname, dsize);
 
-	*n = min(*n, (uint32_t)_res.nscount);
-	if (!*n) {
+	if (!_res.nscount) {
 		err = ENOENT;
 		goto out;
 	}
 
 	err = 0;
-	for (i=0; i<*n && !err; i++) {
+	for (i=0; i<min(*n, (uint32_t)_res.nscount) && !err; i++) {
 		struct sockaddr_in *addr = &_res.nsaddr_list[i];
 		err |= sa_set_sa(&nsv[i], (struct sockaddr *)addr);
 	}
+	if (err)
+		goto out;
+
+	*n = i;
 
  out:
 	res_close();