From: Willy Tarreau <w@1wt.eu>
Date: Fri, 12 Feb 2021 12:33:03 +0000 (+0100)
Subject: MINOR: proxy: also store the name for a defaults section
X-Git-Tag: v2.4-dev8~30
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=c02ab031420f2d36bb2354eabdd701f1d9b3d3c5;p=haproxy.git

MINOR: proxy: also store the name for a defaults section

There's an optional name, but till now it was not even saved into the
structure, let's keep it.
---

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 56cab535a..3c252d2bb 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -261,6 +261,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 		init_new_proxy(curr_defproxy);
 		proxy_preset_defaults(curr_defproxy);
 		curproxy = curr_defproxy;
+		curproxy->id = strdup(args[1]); // may be empty
 		curproxy->conf.args.file = curproxy->conf.file = strdup(file);
 		curproxy->conf.args.line = curproxy->conf.line = linenum;
 		defproxy.cap = PR_CAP_DEF | PR_CAP_LISTEN; /* all caps for now */
diff --git a/src/proxy.c b/src/proxy.c
index a0aaa5ca6..53518807f 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1111,6 +1111,7 @@ void proxy_preset_defaults(struct proxy *defproxy)
  */
 void proxy_free_defaults(struct proxy *defproxy)
 {
+	free(defproxy->id); defproxy->id = NULL;
 	free(defproxy->conf.file); defproxy->conf.file = NULL;
 	free(defproxy->check_command); defproxy->check_command = NULL;
 	free(defproxy->check_path); defproxy->check_path = NULL;