From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 17 Dec 2024 18:01:13 +0000 (+0100)
Subject: capability-util: introduce capability_is_set() helper
X-Git-Tag: v258-rc1~1806^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5370d35d6ea88a99d84e8549f67b271b91ade25;p=thirdparty%2Fsystemd.git

capability-util: introduce capability_is_set() helper
---

diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index 7f9160e0069..0195518d84e 100644
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -69,12 +69,16 @@ assert_cc(CAP_LAST_CAP < 64);
 
 #define CAPABILITY_QUINTET_NULL { CAP_MASK_UNSET, CAP_MASK_UNSET, CAP_MASK_UNSET, CAP_MASK_UNSET, CAP_MASK_UNSET }
 
+static inline bool capability_is_set(uint64_t v) {
+        return v != CAP_MASK_UNSET;
+}
+
 static inline bool capability_quintet_is_set(const CapabilityQuintet *q) {
-        return q->effective != CAP_MASK_UNSET ||
-                q->bounding != CAP_MASK_UNSET ||
-                q->inheritable != CAP_MASK_UNSET ||
-                q->permitted != CAP_MASK_UNSET ||
-                q->ambient != CAP_MASK_UNSET;
+        return capability_is_set(q->effective) ||
+                capability_is_set(q->bounding) ||
+                capability_is_set(q->inheritable) ||
+                capability_is_set(q->permitted) ||
+                capability_is_set(q->ambient);
 }
 
 /* Mangles the specified caps quintet taking the current bounding set into account: