diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-21 11:08:09 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-21 11:08:58 +0100 |
commit | 6757a0135675107576502a034c1068192f9d233d (patch) | |
tree | d67d13ee507b4b563e4aec324817fd0a5936798d /src/basic | |
parent | f1531db5af1d8e740d5fa393dfafc115a13c0831 (diff) | |
download | systemd-6757a0135675107576502a034c1068192f9d233d.tar.gz |
util-lib: get rid of a helper variable
Diffstat (limited to 'src/basic')
-rw-r--r-- | src/basic/capability-util.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c index 45fadb9faa..99628f6260 100644 --- a/src/basic/capability-util.c +++ b/src/basic/capability-util.c @@ -367,8 +367,7 @@ bool ambient_capabilities_supported(void) { } int capability_quintet_enforce(const CapabilityQuintet *q) { - _cleanup_cap_free_ cap_t c = NULL; - bool need_set_proc_again = false; + _cleanup_cap_free_ cap_t c = NULL, modified = NULL; int r; if (q->ambient != (uint64_t) -1) { @@ -493,8 +492,6 @@ int capability_quintet_enforce(const CapabilityQuintet *q) { } if (changed) { - _cleanup_cap_free_ cap_t modified = NULL; - /* In order to change the bounding caps, we need to keep CAP_SETPCAP for a bit * longer. Let's add it to our list hence for now. */ if (q->bounding != (uint64_t) -1) { @@ -522,8 +519,6 @@ int capability_quintet_enforce(const CapabilityQuintet *q) { * caps in inherited/permitted/effective anymore, but only lose them.*/ if (cap_set_proc(modified ?: c) < 0) return -errno; - - need_set_proc_again = !!modified; } } @@ -537,7 +532,7 @@ int capability_quintet_enforce(const CapabilityQuintet *q) { * we have already set only in the CAP_SETPCAP bit, which we needed for dropping the bounding * bits. This call only undoes bits and doesn't acquire any which means the bounding caps don't * matter. */ - if (need_set_proc_again) + if (modified) if (cap_set_proc(c) < 0) return -errno; |