From: Baptiste Assmann <bedis9@gmail.com>
Date: Wed, 20 Jan 2016 23:59:46 +0000 (+0100)
Subject: BUG/MEDIUM: dns: no DNS resolution happens if no ports provided to the nameserver
X-Git-Tag: v1.7-dev2~142
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f43fa9b2ca1a981d89636416f49f2405290c7aa;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: dns: no DNS resolution happens if no ports provided to the nameserver

Erez reported a bug on discourse.haproxy.org about DNS resolution not
occuring when no port is specified on the nameserver directive.

This patch prevent this behavior by returning an error explaining this
issue when parsing the configuration file.
That said, later, we may want to force port 53 when client did not
provide any.

backport: 1.6
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index efbf10dd52..86558baec4 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2317,6 +2317,13 @@ int cfg_parse_resolvers(const char *file, int linenum, char **args, int kwm)
 			goto out;
 		}
 
+		if (!port1 && !port2) {
+			Alert("parsing [%s:%d] : '%s %s' : no UDP port specified\n",
+				file, linenum, args[0], args[1]);
+			err_code |= ERR_ALERT | ERR_FATAL;
+			goto out;
+		}
+
 		newnameserver->addr = *sk;
 	}
 	else if (strcmp(args[0], "hold") == 0) { /* hold periods */