X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fcapability-util.h;h=913048e4c6804e85344dbad919d83a99d418af0c;hb=6414babd8b4554e19f9ac7826cb7e82ef6b3435c;hp=3f6c988f617912634d11ebdfd91dec140451a09f;hpb=bccdfb431a266e7671d518fd5a42362a5ce724c9;p=elogind.git

diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index 3f6c988f6..913048e4c 100644
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -22,21 +20,28 @@
 ***/
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/capability.h>
+#include <sys/types.h>
 
+#include "macro.h"
 #include "util.h"
 
+#define CAP_ALL (uint64_t) -1
+
 unsigned long cap_last_cap(void);
-// UNNEEDED int have_effective_cap(int value);
-// UNNEEDED int capability_bounding_set_drop(uint64_t drop, bool right_now);
-// UNNEEDED int capability_bounding_set_drop_usermode(uint64_t drop);
+#if 0 /// UNNEEDED by elogind
+int have_effective_cap(int value);
+int capability_bounding_set_drop(uint64_t keep, bool right_now);
+int capability_bounding_set_drop_usermode(uint64_t keep);
+
+int capability_ambient_set_apply(uint64_t set, bool also_inherit);
+int capability_update_inherited_set(cap_t caps, uint64_t ambient_set);
 
-// UNNEEDED int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities);
+int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities);
 
-// UNNEEDED int drop_capability(cap_value_t cv);
+int drop_capability(cap_value_t cv);
 
-/// UNNEEDED by elogind
-#if 0
 DEFINE_TRIVIAL_CLEANUP_FUNC(cap_t, cap_free);
 #define _cleanup_cap_free_ _cleanup_(cap_freep)
 
@@ -46,3 +51,9 @@ static inline void cap_free_charpp(char **p) {
 }
 #define _cleanup_cap_free_charp_ _cleanup_(cap_free_charpp)
 #endif // 0
+
+static inline bool cap_test_all(uint64_t caps) {
+        uint64_t m;
+        m = (UINT64_C(1) << (cap_last_cap() + 1)) - 1;
+        return (caps & m) == m;
+}