X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=ae53710b24783dbf5193eacd242833e07e6414af;hb=e1bfa71aca1f37c2f293dc9adb44065c6e7a9ad9;hp=15fa15a79099b1faf28af0a20ef9a629eacc2ad2;hpb=f8e1e81d433c5b4e06792c2617abf0e6ec9e76d9;p=collectd.git

diff --git a/src/dns.c b/src/dns.c
index 15fa15a7..ae53710b 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -28,13 +28,16 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include "utils_dns.h"
 #include <poll.h>
 
 #include <pcap.h>
 
+#ifdef HAVE_SYS_CAPABILITY_H
+# include <sys/capability.h>
+#endif
+
 /*
  * Private data types
  */
@@ -347,18 +350,29 @@ static int dns_init (void)
 
 	listen_thread_init = 1;
 
+#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?");
+		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 "
+					"cap_net_raw=ep\" on the collectd binary.");
+	}
+#endif
+
 	return (0);
 } /* int dns_init */
 
 static void submit_derive (const char *type, const char *type_instance,
 		derive_t value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].derive = value;
-
-	vl.values = values;
+	vl.values = &(value_t) { .derive = value };
 	vl.values_len = 1;
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "dns", sizeof (vl.plugin));
@@ -370,14 +384,14 @@ static void submit_derive (const char *type, const char *type_instance,
 
 static void submit_octets (derive_t queries, derive_t responses)
 {
-	value_t values[2];
+	value_t values[] = {
+          { .derive = queries },
+          { .derive = responses },
+        };
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].derive = queries;
-	values[1].derive = responses;
-
 	vl.values = values;
-	vl.values_len = 2;
+	vl.values_len = STATIC_ARRAY_SIZE (values);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "dns", sizeof (vl.plugin));
 	sstrncpy (vl.type, "dns_octets", sizeof (vl.type));