From: Willy Tarreau <w@1wt.eu>
Date: Fri, 12 Mar 2021 14:00:57 +0000 (+0100)
Subject: MINOR: cli: set the ACCESS_MASTER* bits on the master bind_conf
X-Git-Tag: v2.4-dev12~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e283ee626573439a0fedd05186c34ec87844827d;p=thirdparty%2Fhaproxy.git

MINOR: cli: set the ACCESS_MASTER* bits on the master bind_conf

Right now the code is a bit hackish, it tests for the keyword's level
flags but checks the applet's origin to compare the bits. Let's start
by properly setting the ACCESS_MASTER_ONLY and ACCESS_MASTER flags on
the master CLI's bind_conf so that they are automatically present
all the time.
---

diff --git a/src/cli.c b/src/cli.c
index 99cb9df864..b21f1c5de1 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -2645,6 +2645,7 @@ int mworker_cli_proxy_new_listener(char *line)
 
 	bind_conf->level &= ~ACCESS_LVL_MASK;
 	bind_conf->level |= ACCESS_LVL_ADMIN;
+	bind_conf->level |= ACCESS_MASTER | ACCESS_MASTER_ONLY;
 
 	if (!str2listener(args[0], mworker_proxy, bind_conf, "master-socket", 0, &err)) {
 		ha_alert("Cannot create the listener of the master CLI\n");