From: Emeric Brun <ebrun@haproxy.com>
Date: Mon, 15 Feb 2021 13:28:27 +0000 (+0100)
Subject: BUG/MINOR: dns: dns_connect_server must return -1 unsupported nameserver's type
X-Git-Tag: v2.4-dev9~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=526b79219ecdf4154d9e79eda2c0cd3b621d622a;p=thirdparty%2Fhaproxy.git

BUG/MINOR: dns: dns_connect_server must return -1 unsupported nameserver's type

This patch fix returns code in case of dns_connect_server is called
on unsupported type (which should not happen). Doing this we have
the warranty that after a return 0 the fd is never -1.

This patch should fix github issues #1127, #1128 and #1130
---

diff --git a/src/dns.c b/src/dns.c
index bc40b29e80..e1f9539e99 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -75,8 +75,10 @@ static int dns_connect_nameserver(struct dns_nameserver *ns)
 		dgram->t.sock.fd = fd;
 		fd_insert(fd, dgram, dgram_fd_handler, MAX_THREADS_MASK);
 		fd_want_recv(fd);
+		return 0;
 	}
-	return 0;
+
+	return -1;
 }
 
 /* Sends a message to a name server