From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Fri, 7 Mar 2025 12:42:27 +0000 (+0100)
Subject: MINOR: startup: adjust alert messages, when capabilities are missed
X-Git-Tag: v3.2-dev7~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d427134fe01e8af56dfa48c6d9e6ecc5defe562;p=thirdparty%2Fhaproxy.git

MINOR: startup: adjust alert messages, when capabilities are missed

CAP_SYS_ADMIN support was added, in order to access sockets in namespaces. So
let's adjust the alert at startup, where we check preserved capabilities from
global.last_checks. Let's mention here cap_sys_admin as well.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 8804d0529..0b36e230f 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3438,8 +3438,8 @@ int main(int argc, char **argv)
 #if defined(USE_LINUX_CAP)
 			ha_alert("[%s.main()] Alternately, if your system supports "
 			         "Linux capabilities, you may also consider using "
-			         "'setcap cap_net_raw' or 'setcap cap_net_admin' in the "
-			         "'global' section.\n", argv[0]);
+			         "'setcap cap_net_raw', 'setcap cap_net_admin' or "
+			         "'setcap cap_sys_admin' in the 'global' section.\n", argv[0]);
 #endif
 			protocol_unbind_all();
 			exit(1);