Merge branch 'collectd-5.5' into collectd-5.6
[collectd.git] / src / dns.c
index be6d0dc..0494b4b 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include "utils_dns.h"
 #include <poll.h>
@@ -351,13 +350,13 @@ static int dns_init (void)
 
        listen_thread_init = 1;
 
-#ifdef HAVE_SYS_CAPABILITY_H
+#if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_NET_RAW)
        if (check_capability (CAP_NET_RAW) != 0)
        {
                if (getuid () == 0)
                        WARNING ("dns plugin: Running collectd as root, but the CAP_NET_RAW "
                                        "capability is missing. The plugin's read function will probably "
-                                       "fail. Is your init system dropping capabilities ?");
+                                       "fail. Is your init system dropping capabilities?");
                else
                        WARNING ("dns plugin: collectd doesn't have the CAP_NET_RAW capability. "
                                        "If you don't want to run collectd as root, try running \"setcap "