]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: server: Copy configuration file and line for server templates
authorChristopher Faulet <cfaulet@haproxy.com>
Mon, 2 Nov 2020 21:04:55 +0000 (22:04 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Tue, 3 Nov 2020 09:44:38 +0000 (10:44 +0100)
When servers based on server templates are initialized, the configuration file
and line are now copied. This helps to emit understandable warning and alert
messages.

This patch may be backported if needed, as far as 1.8.

src/server.c

index 4b7d7d75b19a5269010646804c8733472de272db..42c2e54e5937ba398061938dea1767cdbbd18f73 100644 (file)
@@ -1862,6 +1862,9 @@ static int server_template_init(struct server *srv, struct proxy *px)
                if (!newsrv)
                        goto err;
 
+               newsrv->conf.file = strdup(srv->conf.file);
+               newsrv->conf.line = srv->conf.line;
+
                srv_settings_cpy(newsrv, srv, 1);
                srv_prepare_for_resolution(newsrv, srv->hostname);
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME