Merge branch 'master' into collectd-4

Conflicts:

	configure.in

diff --git a/ChangeLog b/ChangeLog
index 6629ab078fffa87c137f2902491de2640209a94c..b3aaed8a53afda1bb6bd9c557c4a0bf3986a07c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,10 @@
        * collectd-nagios: The new `collectd-nagios' binary queries values
          from collectd, parses them and exits according to Nagios-standards.
 
+2007-04-10, Version 3.11.4
+       * dns plugin: Change the order of includes to make the plugin compile
+         under FreeBSD.
+
 2007-03-30, Version 3.11.3
        * configure: Have the configure-script define `HAVE_LIBKSTAT' instead
          of the unused `COLLECT_KSTAT'.

diff --git a/debian/changelog b/debian/changelog
index fead67273594b0bf5a9826f8bca9f6fc77c86258..8d04e16c0df60f3ec684905f8ee5861210f033cd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.11.4-0octo1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Florian Forster <octo@leeloo.home.verplant.org>  Tue, 10 Apr 2007 17:18:11 +0200
+
 collectd (3.11.3-0octo1) unstable; urgency=low
 
   * New upstream release.

diff --git a/src/utils_dns.c b/src/utils_dns.c
index 6541b897ffdd68da466472269998b3d4b893d549..0943727536e92e56b384a0b7ebc9542464957724 100644 (file)
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -41,12 +41,12 @@
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
-#if HAVE_PCAP_H
-# include <pcap.h>
-#endif
 #if HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 
 #if HAVE_ARPA_NAMESER_H
 # include <arpa/nameser.h>
@@ -67,9 +67,6 @@
 # include <net/if_ppp.h>
 #endif
 
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
@@ -87,6 +84,10 @@
 # include <netinet/udp.h>
 #endif
 
+#if HAVE_PCAP_H
+# include <pcap.h>
+#endif
+
 #define PCAP_SNAPLEN 1460
 #ifndef ETHER_HDR_LEN
 #define ETHER_ADDR_LEN 6