commit 6f79aca33939a75ea68b1d256ba2dc06104b1cd2
author Baptiste Assmann <bedis9@gmail.com> Tue Apr 05 21:19:51 2016 +0200
committer Willy Tarreau <w@1wt.eu> Tue Apr 05 21:35:42 2016 +0200
tree 675b08146ef9fc005bd9b7bf71bb99b3531e91d8
parent 7365f7d41b361335c7fad163bd3b7c92870a233a

BUG/MINOR: DNS: resolution structure change

060e57301db98853eef91b344b6ace187b657190 introduced a bug, related to a
dns option structure change and an improper rebase.

Thanks Lukas Tribus for reporting it.

backport: 1.7 and above

src/dns.c

diff --git a/src/dns.c b/src/dns.c
index 4603e21..3906742 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -1194,8 +1194,8 @@
 
 		resolution->try -= 1;
 
-		res_preferred_afinet = resolution->resolver_family_priority == AF_INET && resolution->query_type == DNS_RTYPE_A;
-		res_preferred_afinet6 = resolution->resolver_family_priority == AF_INET6 && resolution->query_type == DNS_RTYPE_AAAA;
+		res_preferred_afinet = resolution->opts->family_prio == AF_INET && resolution->query_type == DNS_RTYPE_A;
+		res_preferred_afinet6 = resolution->opts->family_prio == AF_INET6 && resolution->query_type == DNS_RTYPE_AAAA;
 
 		/* let's change the query type if needed */
 		if (res_preferred_afinet6) {