upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-04 22:30:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

BUG/MINOR: DNS: resolution structure change

Browse source 
060e57301d 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
This commit is contained in:
Baptiste Assmann 2016-04-05 21:19:51 +02:00 committed by Willy Tarreau
parent 7365f7d41b
commit 6f79aca339
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dns.c
View file

@ -1194,8 +1194,8 @@ struct task *dns_process_resolve(struct task *t)
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) {