pdns: Include lua-auth and it's dependencies in pdnsutil

Needed by lua2 backend

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 746f9b951efad94c948c90bda38fa7df7cb56106..90d31918af2c9a9a0584aa740128c85457dbfc0a 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -305,6 +305,8 @@ pdnsutil_SOURCES = \
        iputils.cc iputils.hh \
        json.cc \
        logger.cc \
+       lua-auth4.cc lua-auth4.hh \
+       lua-base4.cc lua-base4.hh \
        misc.cc misc.hh \
        nsecrecords.cc \
        opensslsigners.cc opensslsigners.hh \
@@ -317,6 +319,7 @@ pdnsutil_SOURCES = \
        sillyrecords.cc \
        sstuff.hh \
        statbag.cc \
+       stubresolver.cc stubresolver.hh \
        ueberbackend.cc \
        unix_utility.cc \
        zoneparser-tng.cc
@@ -366,6 +369,10 @@ pdnsutil_SOURCES +=  pkcs11signers.cc pkcs11signers.hh
 pdnsutil_LDADD += $(P11KIT1_LIBS)
 endif
 
+if LUA
+pdnsutil_LDADD += $(LUA_LIBS)
+endif
+
 if GSS_TSIG
 pdnsutil_LDADD += $(GSS_LIBS)
 endif

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index b324b18235c570ac1a97205a1982dded3bf9f856..cf8d7a32a2275d0689d6b54913053bcf96ef5d6d 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -80,6 +80,7 @@ void loadMainConfig(const std::string& configdir)
   string configname=::arg()["config-dir"]+"/"+s_programname+".conf";
   cleanSlashes(configname);
 
+  ::arg().set("resolver","Use this resolver for ALIAS and the internal stub resolver")="no";
   ::arg().set("default-ksk-algorithm","Default KSK algorithm")="ecdsa256";
   ::arg().set("default-ksk-size","Default KSK size (0 means default)")="0";
   ::arg().set("default-zsk-algorithm","Default ZSK algorithm")="";