From 08ba5eb272fd841107a2fb79e62c8ee91dd9c852 Mon Sep 17 00:00:00 2001 From: Valentine Krasnobaeva Date: Fri, 7 Mar 2025 13:42:27 +0100 Subject: [PATCH] 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. (cherry picked from commit 7d427134fe01e8af56dfa48c6d9e6ecc5defe562) Signed-off-by: Willy Tarreau (cherry picked from commit 77b340e17d3da9fc78ed113ebe98b2101c10994c) Signed-off-by: Willy Tarreau --- src/haproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/haproxy.c b/src/haproxy.c index 9b95207..2766c85 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -3672,8 +3672,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); -- 1.7.10.4