X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fcommon.c;h=ec5c7ababee0473c006cd90206afe6d1d2b42188;hb=11c8a760c2d354b2f4637bdb297efb253bfaa519;hp=1fa99eb245682114ea04e85457c4462121426b34;hpb=d3be3ed7cb69be4a9a256449d4885d4a55399de0;p=collectd.git diff --git a/src/daemon/common.c b/src/daemon/common.c index 1fa99eb2..ec5c7aba 100644 --- a/src/daemon/common.c +++ b/src/daemon/common.c @@ -1568,16 +1568,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) /* {{{ */