Merge branch 'collectd-5.5'

[collectd.git] / src / exec.c

diff --git a/src/exec.c b/src/exec.c
index c51465b..dfd4b05 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -810,14 +810,14 @@ static int exec_init (void) /* {{{ */
 
   sigaction (SIGCHLD, &sa, NULL);
 
-#ifdef HAVE_SYS_CAPABILITY_H
+#if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_SETUID) && defined(CAP_SETGID)
   if ((check_capability (CAP_SETUID) != 0) ||
       (check_capability (CAP_SETGID) != 0))
   {
     if (getuid () == 0)
       WARNING ("exec plugin: Running collectd as root, but the CAP_SETUID "
           "or CAP_SETGID capabilities are missing. The plugin's read function "
-          "will probably fail. Is your init system dropping capabilities ?");
+          "will probably fail. Is your init system dropping capabilities?");
     else
       WARNING ("exec plugin: collectd doesn't have the CAP_SETUID or "
           "CAP_SETGID capabilities. If you don't want to run collectd as root, "