X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fcommon.c;fp=src%2Fdaemon%2Fcommon.c;h=2be2e8e57c31d175189f0287ca0b9e4acbe8c37d;hb=f1b6145ce2bf1bc5061c4aafcf63e90bdc6b8b5c;hp=7ead55d12a411b62ad1831c9618a1f87ecaa3d6e;hpb=6969c629641e681069d17c117829779191b8896d;p=collectd.git diff --git a/src/daemon/common.c b/src/daemon/common.c index 7ead55d1..2be2e8e5 100644 --- a/src/daemon/common.c +++ b/src/daemon/common.c @@ -1527,16 +1527,26 @@ void strarray_free(char **array, size_t array_len) /* {{{ */ #if HAVE_CAPABILITY int check_capability(int arg) /* {{{ */ { - cap_value_t cap = (cap_value_t)arg; + cap_value_t cap_value = (cap_value_t)arg; + cap_t cap; + cap_flag_value_t cap_flag_value; - if (!CAP_IS_SUPPORTED(cap)) + if (!CAP_IS_SUPPORTED(cap_value)) return (-1); - int have_cap = cap_get_bound(cap); - if (have_cap != 1) + if (!(cap = cap_get_proc())) { + ERROR("check_capability: cap_get_proc failed."); return (-1); + } - return (0); + if (cap_get_flag(cap, cap_value, CAP_EFFECTIVE, &cap_flag_value) < 0) { + ERROR("check_capability: cap_get_flag failed."); + cap_free(cap); + return (-1); + } + cap_free(cap); + + return (cap_flag_value != CAP_SET); } /* }}} int check_capability */ #else int check_capability(__attribute__((unused)) int arg) /* {{{ */