Merge branch 'collectd-4.10' into collectd-5.0

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.c
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/common.c
Simple merge

diff --cc src/df.c
Simple merge

diff --cc src/memcachec.c
Simple merge

diff --cc src/netapp.c
Simple merge

diff --cc src/oracle.c
Simple merge

diff --cc src/rrdtool.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/utils_dns.c
index cfd0ccf,2899bd4..80a2ee5
--- 1/src/utils_dns.c
--- 2/src/utils_dns.c
+++ b/src/utils_dns.c
@@@ -533,15 -498,15 +532,15 @@@ handle_ip(const struct ip *ip, int len
  {
      char buf[PCAP_SNAPLEN];
      int offset = ip->ip_hl << 2;
-     struct in6_addr s_addr;
-     struct in6_addr d_addr;
+     struct in6_addr c_src_addr;
+     struct in6_addr c_dst_addr;
  
      if (ip->ip_v == 6)
 -      return (handle_ipv6 ((struct ip6_hdr *) ip, len));
 +      return (handle_ipv6 ((void *) ip, len));
  
-     in6_addr_from_buffer (&s_addr, &ip->ip_src.s_addr, sizeof (ip->ip_src.s_addr), AF_INET);
-     in6_addr_from_buffer (&d_addr, &ip->ip_dst.s_addr, sizeof (ip->ip_dst.s_addr), AF_INET);
-     if (ignore_list_match (&s_addr))
+     in6_addr_from_buffer (&c_src_addr, &ip->ip_src.s_addr, sizeof (ip->ip_src.s_addr), AF_INET);
+     in6_addr_from_buffer (&c_dst_addr, &ip->ip_dst.s_addr, sizeof (ip->ip_dst.s_addr), AF_INET);
+     if (ignore_list_match (&c_src_addr))
            return (0);
      if (IPPROTO_UDP != ip->ip_p)
        return 0;