From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Thu, 20 Apr 2017 10:17:50 +0000 (+0200)
Subject: BUG/MINOR: server: missing default server 'resolvers' setting duplication.
X-Git-Tag: v1.8-dev2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daa2fe662116e0741d16c9deb6825773abb0bff3;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: missing default server 'resolvers' setting duplication.

'resolvers' setting was not duplicated from default server setting to
new server instances when parsing 'server' lines.
This fix is simple: strdup() default resolvers <id> string argument after
having allocated a new server when parsing 'server' lines.

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

diff --git a/src/server.c b/src/server.c
index a151fd4cfc..63569cf04e 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1813,6 +1813,8 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
 			newsrv->agent.fall	= curproxy->defsrv.agent.fall;
 			newsrv->agent.health	= newsrv->agent.rise;	/* up, but will fall down at first failure */
 			newsrv->agent.server	= newsrv;
+			if (curproxy->defsrv.resolvers_id != NULL)
+				newsrv->resolvers_id = strdup(curproxy->defsrv.resolvers_id);
 			newsrv->dns_opts.family_prio = curproxy->defsrv.dns_opts.family_prio;
 			if (newsrv->dns_opts.family_prio == AF_UNSPEC)
 				newsrv->dns_opts.family_prio = AF_INET6;
@@ -1939,6 +1941,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
 				cur_arg += 2;
 			}
 			else if (!strcmp(args[cur_arg], "resolvers")) {
+				free(newsrv->resolvers_id);
 				newsrv->resolvers_id = strdup(args[cur_arg + 1]);
 				cur_arg += 2;
 			}