Merge branch 'master' into patch-1

diff --cc build-scripts/travis.sh
index 0e7497e26bbdd680f20f003ffc43c212a84af4f6,d4275eb590cb689045bb65846bd9564b4f89856f..3efa2dc8f07eec08fe2cddffee1a652ab7953f82
--- 1/build-scripts/travis.sh
--- 2/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@@ -454,12 -492,6 +492,8 @@@ test_auth() 
    #travis unbound is too old for this test (unbound 1.6.0 required)
    run "touch tests/ent-asterisk/fail.nsec"
  
-   run "./timestamp ./start-test-stop 5300 ldap-tree"
-   run "./timestamp ./start-test-stop 5300 ldap-simple"
-   run "./timestamp ./start-test-stop 5300 ldap-strict"
- 
 +  run "./timestamp ./start-test-stop 5300 lua-minimal nowait 0 apex-level-a-but-no-a"
 +
    run "./timestamp ./start-test-stop 5300 bind-both"
    run "./timestamp ./start-test-stop 5300 bind-dnssec-both"
    run "./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-both"

diff --cc docs/backends/lua.rst
Simple merge

diff --cc modules/luabackend/luabackend.hh
Simple merge

diff --cc modules/luabackend/minimal.cc
index 83e94c5a4a86c2224314903b29b7388b45643ae6,04af2b46c443309171bf1e7a0fa54c0c8620e2a9..c18b21b98d01abcab765ce6186d288a23cd0d32f
--- 1/modules/luabackend/minimal.cc
--- 2/modules/luabackend/minimal.cc
+++ b/modules/luabackend/minimal.cc
@@@ -165,13 -154,29 +165,13 @@@ bool LUABackend::get(DNSResourceRecord 
      if (rr.ttl == 0)
          rr.ttl = ::arg().asNum( "default-ttl" );
  
 -    getValueFromTable(lua, "content", rr.content);
 -    getValueFromTable(lua, "scopeMask", rr.scopeMask);
 -
 -    lua_pop(lua, 1 );
 -
      if (logging)
 -      g_log << Logger::Info << backend_name << "(get) END" << endl;
 +      g_log << Logger::Info << backend_name << "(get) END " << got_content << endl;
  
 -    return !rr.content.empty();
 +    return got_content;
  }
  
- bool LUABackend::getSOA(const DNSName &name, SOAData &soadata, bool unmodifiedSerial) {
+ bool LUABackend::getSOA(const DNSName &name, SOAData &soadata) {
      if (logging)
        g_log << Logger::Info << backend_name << "(getsoa) BEGIN" << endl;
  

diff --cc modules/luabackend/slave.cc
Simple merge

diff --cc regression-tests/backends/common
Simple merge

diff --cc regression-tests/start-test-stop
index 156f634a50541446439137df61e71246d73adcd0,aec0868634f8118efcf0cbca481bc17f43494ef4..06431b7620a1024cdae8f6d3c8eccf2a271a298a
--- 1/regression-tests/start-test-stop
--- 2/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@@ -26,59 -28,6 +28,60 @@@ MAKE=${MAKE:-make
  export ALGORITHM
  export KEY
  
 +_show_help=0
 +for arg; do
 +    case "$arg" in
 +        (--help|help)
 +            _show_help=1
 +            ;;
 +    esac
 +done; unset -v arg
 +if [ "$_show_help" -eq 1 ]; then
 +      grep -v '^#' << '__EOF__'
 +
 +Usage: ./start-test-stop <port> [<context>] [wait|nowait] [<cachettl>] [<specifictest>]
 +
 +context is one of:
 +bind bind-dnssec bind-dnssec-nsec3 bind-dnssec-nsec3-optout bind-dnssec-nsec3-narrow
 +geoip geoip-nsec3-narrow
 +gmysql-nodnssec gmysql gmysql-nsec3 gmysql-nsec3-optout gmysql-nsec3-narrow
 +godbc_mssql-nodnssec godbc_mssql godbc_mssql-nsec3 godbc_mssql-nsec3-optout godbc_mssql-nsec3-narrow
 +goracle-nodnssec goracle goracle-nsec3 goracle-nsec3-optout goracle-nsec3-narrow
 +godbc_sqlite3-nodnssec godbc_sqlite3 godbc_sqlite3-nsec3 godbc_sqlite3-nsec3-optout godbc_sqlite3-narrow
 +gpgsql-nodnssec gpgsql gpgsql-nsec3 gpgsql-nsec3-optout gpgsql-nsec3-narrow
 +gsqlite3-nodnssec gsqlite3 gsqlite3-nsec3 gsqlite3-nsec3-optout gsqlite3-nsec3-narrow
++lmdb-nodnssec lmdb
 +mydns
 +opendbx-sqlite3
 +oracle-nodnssec oracle oracle-nsec3
 +remotebackend-pipe remotebackend-unix remotebackend-http remotebackend-zeromq
 +remotebackend-pipe-dnssec remotebackend-unix-dnssec remotebackend-http-dnssec remotebackend-zeromq-dnssec
 +#remotebackend-pipe-nsec3 remotebackend-unix-nsec3 remotebackend-http-nsec3
 +#remotebackend-pipe-nsec3-narrow remotebackend-unix-nsec3-narrow remotebackend-http-nsec3-narrow
 +tinydns
 +ldap-tree ldap-simple ldap-strict
 +lua2 lua2-dnssec lua2-nsec3 lua2-nsec3-narrow
 +lua-minimal
 +#ext-nsd ext-nsd-nsec ext-nsd-nsec3 ext-bind ext-bind-nsec ext-bind-nsec3
 +
 +* Add -presigned to any ext-nsd, ext-bind, bind, gmysql or gsqlite3 test (except narrow)
 +  to test presigned operation.
 +
 +* Add -both to any bind or gmysql test (except narrow) to
 +  test normal and presigned operation.
 +
 +* Add 'wait' (literally) after the context to not kill
 +  pdns_server immediately after testing. 'nowait' will kill it.
 +
 +* A cachettl can be supplied if you want to run tests with a
 +  ttl setting set. The default cachettl is 0.
 +
 +* Specifictest can be used to run only one single test.
 +__EOF__
 +      exit
 +fi
 +unset -v _show_help
 +
  trap "kill_process 2" EXIT INT TERM
  
  source ../regression-tests/common