MINOR: startup: adjust alert messages, when capabilities are missed
authorValentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Fri, 7 Mar 2025 12:42:27 +0000 (13:42 +0100)
committerWilly Tarreau <w@1wt.eu>
Thu, 13 Mar 2025 15:23:54 +0000 (16:23 +0100)
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 <w@1wt.eu>
(cherry picked from commit 77b340e17d3da9fc78ed113ebe98b2101c10994c)
Signed-off-by: Willy Tarreau <w@1wt.eu>

src/haproxy.c

index 9b95207..2766c85 100644 (file)
@@ -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);