From 6f79aca33939a75ea68b1d256ba2dc06104b1cd2 Mon Sep 17 00:00:00 2001 From: Baptiste Assmann Date: Tue, 5 Apr 2016 21:19:51 +0200 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dns.c b/src/dns.c index 4603e21f7..3906742bc 100644 --- a/src/dns.c +++ b/src/dns.c @@ -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) {