]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: replace cap_to_text() with capability_get() and capability_set_to_string()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 23 Oct 2025 14:17:36 +0000 (23:17 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 23 Oct 2025 16:52:59 +0000 (01:52 +0900)
src/test/test-capability-util.c

index ef04e77a5c95b202e607bdc55400a0f63711b779..c49fadfd7bb30217b8e917a0c2f8d50a21318def 100644 (file)
@@ -13,6 +13,7 @@
 #define TEST_CAPABILITY_C
 
 #include "alloc-util.h"
+#include "capability-list.h"
 #include "capability-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
@@ -84,18 +85,15 @@ static void fork_test(void (*test_func)(void)) {
 }
 
 static void show_capabilities(void) {
-        cap_t caps;
-        char *text;
+        _cleanup_free_ char *e = NULL, *p = NULL, *i = NULL;
+        CapabilityQuintet q;
 
-        caps = cap_get_proc();
-        assert_se(caps);
+        ASSERT_OK(capability_get(&q));
+        ASSERT_OK(capability_set_to_string(q.effective, &e));
+        ASSERT_OK(capability_set_to_string(q.permitted, &p));
+        ASSERT_OK(capability_set_to_string(q.inheritable, &i));
 
-        text = cap_to_text(caps, NULL);
-        assert_se(text);
-
-        log_info("Capabilities:%s", text);
-        cap_free(caps);
-        cap_free(text);
+        log_info("Capabilities:e=%s p=%s, i=%s", e, p, i);
 }
 
 static int setup_tests(bool *run_ambient) {