util: introduce our own gperf based capability list

[elogind.git] / src / core / load-fragment.c

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 7f109b893080599d91b73fe476ae2bf3ec5a0c1e..259323bd5cd035a76d1b0fbf27af07f93e5c9f4f 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -59,6 +59,7 @@
 #include "bus-error.h"
 #include "errno-list.h"
 #include "af-list.h"
 #include "bus-error.h"
 #include "errno-list.h"
 #include "af-list.h"

+#include "cap-list.h"

 
 #ifdef HAVE_SECCOMP
 #include "seccomp-util.h"
 
 #ifdef HAVE_SECCOMP
 #include "seccomp-util.h"


@@ -1040,17 +1041,15 @@ int config_parse_bounding_set(const char *unit,
 
         FOREACH_WORD_QUOTED(word, l, rvalue, state) {
                 _cleanup_free_ char *t = NULL;
 
         FOREACH_WORD_QUOTED(word, l, rvalue, state) {
                 _cleanup_free_ char *t = NULL;

-                int r;
-                cap_value_t cap;
+                int cap;

 
                 t = strndup(word, l);
                 if (!t)
                         return log_oom();
 
 
                 t = strndup(word, l);
                 if (!t)
                         return log_oom();
 

-                r = cap_from_name(t, &cap);
-                if (r < 0) {
-                        log_syntax(unit, LOG_ERR, filename, line, errno,
-                                   "Failed to parse capability in bounding set, ignoring: %s", t);
+                cap = capability_from_name(t);
+                if (cap < 0) {
+                        log_syntax(unit, LOG_ERR, filename, line, errno, "Failed to parse capability in bounding set, ignoring: %s", t);

                         continue;
                 }
 
                         continue;
                 }