FIx the autoconf checks for res_init().

diff --git a/configure.ac b/configure.ac
index 000c7cf674dff4079b1a14b358c12f4d75cf47ab..baa0224fc8fb431bdcb11adde803e51a422b8244 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -158,11 +158,11 @@ dnl Checks for header files.
 dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
 
 AC_HEADER_STDC
 dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
 
 AC_HEADER_STDC

-AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/resource.h sys/socket.h sys/time.h time.h sys/uio.h sys/wait.h netdb.h arpa/inet.h dirent.h resolv.h])
+AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/resource.h sys/socket.h sys/time.h time.h sys/uio.h sys/wait.h netdb.h arpa/inet.h arpa/nameser.h dirent.h])

 AC_CHECK_HEADERS([net/if.h net/if_types.h linux/if_tun.h net/if_tun.h net/tun/if_tun.h net/if_tap.h net/tap/if_tap.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h netpacket/packet.h],
   [], [], [#include "src/have.h"]
 )
 AC_CHECK_HEADERS([net/if.h net/if_types.h linux/if_tun.h net/if_tun.h net/tun/if_tun.h net/if_tap.h net/tap/if_tap.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h netpacket/packet.h],
   [], [], [#include "src/have.h"]
 )

-AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
+AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h resolv.h],

   [], [], [#include "src/have.h"]
 )
 AC_CHECK_HEADERS([netinet/tcp.h netinet/ip_icmp.h netinet/icmp6.h],
   [], [], [#include "src/have.h"]
 )
 AC_CHECK_HEADERS([netinet/tcp.h netinet/ip_icmp.h netinet/icmp6.h],

diff --git a/src/net.c b/src/net.c
index 60f46cbb30410115c4e138ee55d2b2246f2688e3..8d0a0cf481ce9ca34197526ec68752785e487972 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>

                   2006      Scott Lamb <slamb@slamb.org>
                  2011      Loïc Grenié <loic.grenie@gmail.com>
 
                   2006      Scott Lamb <slamb@slamb.org>
                  2011      Loïc Grenié <loic.grenie@gmail.com>
 


@@ -41,6 +41,10 @@
 #include "subnet.h"
 #include "xalloc.h"
 
 #include "subnet.h"
 #include "xalloc.h"
 

+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+

 #ifdef HAVE_RESOLV_H
 #include <resolv.h>
 #endif
 #ifdef HAVE_RESOLV_H
 #include <resolv.h>
 #endif


@@ -504,7 +508,7 @@ int main_loop(void) {
                        avl_node_t *node;
                        logger(LOG_INFO, "Flushing event queue");
                        expire_events();
                        avl_node_t *node;
                        logger(LOG_INFO, "Flushing event queue");
                        expire_events();

-#ifdef HAVE_DECL_RES_INIT
+#if HAVE_DECL_RES_INIT

                        res_init();
 #endif
                        for(node = connection_tree->head; node; node = node->next) {
                        res_init();
 #endif
                        for(node = connection_tree->head; node; node = node->next) {