From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 18 Jan 2025 22:37:39 +0000 (+0900)
Subject: capability-util: rename output argument of capability_gain_cap_setpcap()
X-Git-Tag: v258-rc1~1557
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cf9635511d11e3c0872e259a728d2c5ab9453fd;p=thirdparty%2Fsystemd.git

capability-util: rename output argument of capability_gain_cap_setpcap()
---

diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index 89c6cbec414..bd8477f4fc2 100644
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -28,7 +28,7 @@ static inline bool capability_is_set(uint64_t v) {
 
 unsigned cap_last_cap(void);
 int have_effective_cap(int value);
-int capability_gain_cap_setpcap(cap_t *return_caps);
+int capability_gain_cap_setpcap(cap_t *ret_before_caps);
 int capability_bounding_set_drop(uint64_t keep, bool right_now);
 int capability_bounding_set_drop_usermode(uint64_t keep);
 
diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index 4332bd23e53..b48f5277bc7 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -5567,7 +5567,7 @@ int exec_invoke(
                          *
                          * Hence there is no security impact to raise it in the effective set before execve
                          */
-                        r = capability_gain_cap_setpcap(/* return_caps= */ NULL);
+                        r = capability_gain_cap_setpcap(/* ret_before_caps = */ NULL);
                         if (r < 0) {
                                 *exit_status = EXIT_CAPABILITIES;
                                 return log_exec_error_errno(context, params, r, "Failed to gain CAP_SETPCAP for setting secure bits");