fix up compilation with lua-ipset after dist-recursor, plus fix up compilation w...

diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index edd6b8a17433a4e3a2a3a085ef0b3f872e0d9338..2415dc6887da80609b8f170a34f43050baa11ae4 100644 (file)
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -24,7 +24,7 @@ dns_random.o pubsuffix.o ext/polarssl/library/aes.o dnslabeltext.o \
 lua-pdns.o lua-recursor.o randomhelper.o recpacketcache.o dns.o \
 reczones.o base32.o nsecrecords.o json.o ws-recursor.o ws-api.o \
 version.o responsestats.o webserver.o ext/yahttp/yahttp/reqresp.o ext/yahttp/yahttp/router.o \
-rec-carbon.o secpoll-recursor.o
+rec-carbon.o secpoll-recursor.o lua-iputils.o
 
 REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.o misc.o \
        unix_utility.o logger.o qtype.o

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index 163270b36ac18b7b72ad2a4e47c874e2a8bc200e..c4f39ffec44ce9b947a0fea3f0d782713866e6a9 100755 (executable)
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -34,7 +34,7 @@ ws-recursor.hh ws-api.hh secpoll-recursor.hh \
 responsestats.hh webserver.hh"
 
 CFILES="syncres.cc  misc.cc unix_utility.cc qtype.cc \
-logger.cc arguments.cc  lwres.cc pdns_recursor.cc  \
+logger.cc arguments.cc  lwres.cc pdns_recursor.cc lua-iputils.cc \
 recursor_cache.cc  dnsparser.cc dnswriter.cc  dnsrecords.cc  rcpgenerator.cc  \
 base64.cc  zoneparser-tng.cc  rec_channel.cc rec_channel_rec.cc rec_control.cc \
 selectmplexer.cc epollmplexer.cc kqueuemplexer.cc portsmplexer.cc pdns_hw.cc \

diff --git a/pdns/lua-iputils.cc b/pdns/lua-iputils.cc
index 89b8f15545128de4e8e80c0fc414cb9a30a84b0d..116bf1035a3ddcd3760b3a07c038095d1efcfc07 100644 (file)
--- a/pdns/lua-iputils.cc
+++ b/pdns/lua-iputils.cc
@@ -1,3 +1,5 @@
+#include "config.h"
+#ifdef HAVE_LUA
 extern "C" {
 #include <lua.h>
 #include <lauxlib.h>
@@ -343,3 +345,4 @@ pair<string, string> splitField(const string& inp, char sepa)
 }
 
 #endif
+#endif

diff --git a/pdns/lua-recursor.cc b/pdns/lua-recursor.cc
index 9a5e6ed77c4b637693f515313daaf2543a9fde1a..be8a5b66c41a3784fdb6a992c6b528fd6437d0c3 100644 (file)
--- a/pdns/lua-recursor.cc
+++ b/pdns/lua-recursor.cc
@@ -32,6 +32,11 @@ bool RecursorLua::preresolve(const ComboAddress& remote, const ComboAddress& loc
   return false;
 }
 
+bool RecursorLua::prequery(const ComboAddress& remote, const ComboAddress& local,const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
+{
+  return false;
+}
+
 
 #else