From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Tue, 11 Apr 2017 06:46:37 +0000 (+0200)
Subject: BUG/MINOR: dns: Wrong address family used when creating IPv6 sockets.
X-Git-Tag: v1.8-dev2~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e5bc9fc235fcce48236795777ef29ae63452056;p=thirdparty%2Fhaproxy.git

BUG/MINOR: dns: Wrong address family used when creating IPv6 sockets.

AF_INET address family was always used to create sockets to connect
to name servers. This prevented any connection over IPv6 from working.

This fix must be backported to 1.7 and 1.6.
---

diff --git a/src/dns.c b/src/dns.c
index 075a70116f..a118598f93 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -1022,7 +1022,7 @@ int dns_init_resolvers(int close_socket)
 			dgram->data = &resolve_dgram_cb;
 
 			/* create network UDP socket for this nameserver */
-			if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
+			if ((fd = socket(curnameserver->addr.ss_family, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
 				Alert("Starting [%s/%s] nameserver: can't create socket.\n", curr_resolvers->id,
 						curnameserver->id);
 				free(dgram);