From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 26 Jan 2016 17:30:17 +0000 (+0100)
Subject: turbostat plugin: use check_capability() function
X-Git-Tag: collectd-5.6.0~57^2~7
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6e8d9b2fa6018a1ed1ec8ab3b6551110449a997c;p=collectd.git

turbostat plugin: use check_capability() function
---

diff --git a/src/turbostat.c b/src/turbostat.c
index 913511f7..6e0405d0 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -1474,13 +1474,8 @@ out:
 static int
 check_permissions(void)
 {
-#ifdef HAVE_SYS_CAPABILITY_H
-	struct __user_cap_header_struct cap_header_data;
-	cap_user_header_t cap_header = &cap_header_data;
-	struct __user_cap_data_struct cap_data_data;
-	cap_user_data_t cap_data = &cap_data_data;
+
 	int ret = 0;
-#endif /* HAVE_SYS_CAPABILITY_H */
 
 	if (getuid() == 0) {
 		/* We have everything we need */
@@ -1494,15 +1489,7 @@ check_permissions(void)
 #else /* HAVE_SYS_CAPABILITY_H */
 	}
 
-	/* check for CAP_SYS_RAWIO */
-	cap_header->pid = getpid();
-	cap_header->version = _LINUX_CAPABILITY_VERSION;
-	if (capget(cap_header, cap_data) < 0) {
-		ERROR("turbostat plugin: capget failed");
-		return -1;
-	}
-
-	if ((cap_data->effective & (1 << CAP_SYS_RAWIO)) == 0) {
+	if (check_capability(CAP_SYS_RAWIO) != 0) {
 		WARNING("turbostat plugin: Collectd doesn't have the "
 			"CAP_SYS_RAWIO capability. If you don't want to run "
 			"collectd as root, try running \"setcap "