From: Kees Monshouwer Date: Thu, 17 Oct 2019 20:29:02 +0000 (+0200) Subject: auth: remove mydns backend X-Git-Tag: dnsdist-1.4.0-rc4~9^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6273e401dc70b20e5ea13cfe38f15f9663447fd2;p=thirdparty%2Fpdns.git auth: remove mydns backend --- diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d6d3ddf39..ad86a8c337 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -503,7 +503,7 @@ jobs: CXXFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \ ./configure \ --disable-lua-records \ - --with-modules='bind lmdb ldap gmysql gsqlite3 gpgsql godbc mydns random tinydns' \ + --with-modules='bind lmdb ldap gmysql gsqlite3 gpgsql godbc random tinydns' \ --enable-systemd \ --enable-tools \ --with-lmdb=/usr \ @@ -659,33 +659,11 @@ jobs: __EOF__ - run: name: Set up mysql client lib to force TCP - command: echo 'export GMYSQLHOST=127.0.0.1 MYDNSHOST=127.0.0.1' > ./vars + command: echo 'export GMYSQLHOST=127.0.0.1' > ./vars workdir: ~/project/regression-tests - auth-regress: context: bind-hybrid-nsec3 - test-auth-regress-mydns: - docker: - - image: debian:buster - - image: circleci/mysql:5 - steps: - - auth-regress-setup - - run: - command: apt-get install -qq -y default-mysql-client - - run: - command: | - cat >> ~/.my.cnf \<<- __EOF__ - [client] - protocol=TCP - __EOF__ - - run: - name: Set up mysql client lib to force TCP - command: echo 'export GMYSQLHOST=127.0.0.1 MYDNSHOST=127.0.0.1' > ./vars - workdir: ~/project/regression-tests - - auth-regress: - context: mydns - doroot: false - test-auth-regress-gmysql: docker: - image: debian:buster @@ -703,7 +681,7 @@ jobs: __EOF__ - run: name: Set up mysql client lib to force TCP - command: echo 'export GMYSQLHOST=127.0.0.1 MYDNSHOST=127.0.0.1 export GMYSQL2HOST=127.0.0.1 MYDNS2HOST=127.0.0.1 ' > ./vars + command: echo 'export GMYSQLHOST=127.0.0.1 export GMYSQL2HOST=127.0.0.1 ' > ./vars workdir: ~/project/regression-tests - auth-regress: context: gmysql-nodnssec-both @@ -1028,7 +1006,7 @@ jobs: ./configure \ --disable-lua-records \ --disable-systemd \ - --with-modules='bind lmdb ldap gmysql gsqlite3 gpgsql godbc mydns random tinydns' \ + --with-modules='bind lmdb ldap gmysql gsqlite3 gpgsql godbc random tinydns' \ --enable-tools \ --with-lmdb=/usr \ --with-libsodium \ @@ -1358,9 +1336,6 @@ workflows: - test-auth-regress-gmysql: requires: - build-auth - - test-auth-regress-mydns: - requires: - - build-auth - test-auth-regress-bind: requires: - build-auth diff --git a/build-scripts/test-auth b/build-scripts/test-auth index 1b33511cca..0ceda84f62 100755 --- a/build-scripts/test-auth +++ b/build-scripts/test-auth @@ -90,8 +90,6 @@ if [ -z "$context" ]; then ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-optout-both || EXITCODE=1 ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-narrow || EXITCODE=1 - ./timestamp ./start-test-stop 5300 mydns || EXITCODE=1 - ./timestamp ./start-test-stop 5300 opendbx-sqlite3 || EXITCODE=1 ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-pipe || EXITCODE=1 diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh index aa6934c62b..9da7b2489b 100755 --- a/build-scripts/travis.sh +++ b/build-scripts/travis.sh @@ -392,7 +392,7 @@ build_auth() { run "autoreconf -vi" run "./configure \ ${sanitizerflags} \ - --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 lmdb lua mydns opendbx pipe random remote tinydns godbc lua2' \ + --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 lmdb lua opendbx pipe random remote tinydns godbc lua2' \ --with-modules='' \ --with-sqlite3 \ --with-libsodium \ @@ -532,8 +532,6 @@ test_auth() { # run "./timestamp ./start-test-stop 5300 gsqlite3-nsec3-optout-both" run "./timestamp ./start-test-stop 5300 gsqlite3-nsec3-narrow" - run "./timestamp ./start-test-stop 5300 mydns" - run "./timestamp ./start-test-stop 5300 opendbx-sqlite3" run "./timestamp ./start-test-stop 5300 remotebackend-pipe" diff --git a/builder-support/debian/authoritative/debian-buster/control b/builder-support/debian/authoritative/debian-buster/control index e262148c82..14fccb0510 100644 --- a/builder-support/debian/authoritative/debian-buster/control +++ b/builder-support/debian/authoritative/debian-buster/control @@ -287,20 +287,6 @@ Description: OpenDBX backend for PowerDNS the libopendbx1-DATABASE package to allow OpenDBX to connect to the chosen database. -Package: pdns-backend-mydns -Architecture: any -Depends: pdns-server (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Provides: pdns-backend -Description: MyDNS compatibility backend for PowerDNS - PowerDNS is a versatile nameserver which supports a large number - of different backends ranging from simple zonefiles to relational - databases and load balancing/failover algorithms. - PowerDNS tries to emphasize speed and security. - . - This package contains the MyDNS compatibility backend for PowerDNS. - Package: pdns-backend-tinydns Architecture: any Depends: pdns-server (= ${binary:Version}), diff --git a/builder-support/debian/authoritative/debian-buster/copyright b/builder-support/debian/authoritative/debian-buster/copyright index 36fd485f74..d42a039c22 100644 --- a/builder-support/debian/authoritative/debian-buster/copyright +++ b/builder-support/debian/authoritative/debian-buster/copyright @@ -48,15 +48,6 @@ Copyright: 2003 Michel Stol 2011 PowerDNS.COM BV License: GPL-2 with OpenSSL Exception -Files: modules/mydnsbackend/* -Copyright: 2011 Jonathan Oddy (Hostway UK) -License: GPL-2 with OpenSSL Exception - -Files: modules/mydnsbackend/schema.mydns.sql -Copyright: 2002-2005 Don Moore - 2007-2008 Howard Wilkinson -License: GPL-2+ - Files: modules/ldapbackend/* pdns/zone2ldap.cc Copyright: 2003-2007 Norbert Sendetzky License: GPL-2 with OpenSSL Exception diff --git a/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.docs b/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.docs deleted file mode 100644 index a47a40c590..0000000000 --- a/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.docs +++ /dev/null @@ -1 +0,0 @@ -modules/mydnsbackend/schema.mydns.sql diff --git a/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.install b/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.install deleted file mode 100644 index 262f35ec75..0000000000 --- a/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/pdns/libmydnsbackend.so* diff --git a/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.postinst b/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.postinst deleted file mode 100644 index 1beff20037..0000000000 --- a/builder-support/debian/authoritative/debian-buster/pdns-backend-mydns.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -dpkg-trigger pdns-server - -#DEBHELPER# - -exit 0 diff --git a/builder-support/debian/authoritative/debian-buster/rules b/builder-support/debian/authoritative/debian-buster/rules index ecfb730cbf..26864689bb 100755 --- a/builder-support/debian/authoritative/debian-buster/rules +++ b/builder-support/debian/authoritative/debian-buster/rules @@ -9,7 +9,7 @@ CXXFLAGS += -Wall export DEB_BUILD_MAINT_OPTIONS = hardening=+all # Backends -backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lmdb lua lua2 mydns remote random opendbx tinydns +backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lmdb lua lua2 remote random opendbx tinydns # Disable systemd integration on non-linux archs ifeq ($(DEB_HOST_ARCH_OS),linux) diff --git a/builder-support/debian/authoritative/debian-jessie/control b/builder-support/debian/authoritative/debian-jessie/control index 4d36e5c76e..b6d8aaf042 100644 --- a/builder-support/debian/authoritative/debian-jessie/control +++ b/builder-support/debian/authoritative/debian-jessie/control @@ -285,20 +285,6 @@ Description: OpenDBX backend for PowerDNS the libopendbx1-DATABASE package to allow OpenDBX to connect to the chosen database. -Package: pdns-backend-mydns -Architecture: any -Depends: pdns-server (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Provides: pdns-backend -Description: MyDNS compatibility backend for PowerDNS - PowerDNS is a versatile nameserver which supports a large number - of different backends ranging from simple zonefiles to relational - databases and load balancing/failover algorithms. - PowerDNS tries to emphasize speed and security. - . - This package contains the MyDNS compatibility backend for PowerDNS. - Package: pdns-backend-tinydns Architecture: any Depends: pdns-server (= ${binary:Version}), diff --git a/builder-support/debian/authoritative/debian-jessie/copyright b/builder-support/debian/authoritative/debian-jessie/copyright index c45339f92f..5345b6b3ab 100644 --- a/builder-support/debian/authoritative/debian-jessie/copyright +++ b/builder-support/debian/authoritative/debian-jessie/copyright @@ -48,15 +48,6 @@ Copyright: 2003 Michel Stol 2011 PowerDNS.COM BV License: GPL-2 with OpenSSL Exception -Files: modules/mydnsbackend/* -Copyright: 2011 Jonathan Oddy (Hostway UK) -License: GPL-2 with OpenSSL Exception - -Files: modules/mydnsbackend/schema.mydns.sql -Copyright: 2002-2005 Don Moore - 2007-2008 Howard Wilkinson -License: GPL-2+ - Files: modules/ldapbackend/* pdns/zone2ldap.cc Copyright: 2003-2007 Norbert Sendetzky License: GPL-2 with OpenSSL Exception diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.docs b/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.docs deleted file mode 100644 index a47a40c590..0000000000 --- a/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.docs +++ /dev/null @@ -1 +0,0 @@ -modules/mydnsbackend/schema.mydns.sql diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.install b/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.install deleted file mode 100644 index 262f35ec75..0000000000 --- a/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/pdns/libmydnsbackend.so* diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.postinst b/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.postinst deleted file mode 100644 index 1beff20037..0000000000 --- a/builder-support/debian/authoritative/debian-jessie/pdns-backend-mydns.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -dpkg-trigger pdns-server - -#DEBHELPER# - -exit 0 diff --git a/builder-support/debian/authoritative/debian-jessie/rules b/builder-support/debian/authoritative/debian-jessie/rules index 54ab7f0590..1c77133cc2 100755 --- a/builder-support/debian/authoritative/debian-jessie/rules +++ b/builder-support/debian/authoritative/debian-jessie/rules @@ -4,7 +4,7 @@ DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # Backends -backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua lua2 mydns remote random opendbx tinydns +backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua lua2 remote random opendbx tinydns # Disable systemd integration on non-linux archs ifeq ($(DEB_HOST_ARCH_OS),linux) diff --git a/builder-support/debian/authoritative/debian-stretch/control b/builder-support/debian/authoritative/debian-stretch/control index e262148c82..14fccb0510 100644 --- a/builder-support/debian/authoritative/debian-stretch/control +++ b/builder-support/debian/authoritative/debian-stretch/control @@ -287,20 +287,6 @@ Description: OpenDBX backend for PowerDNS the libopendbx1-DATABASE package to allow OpenDBX to connect to the chosen database. -Package: pdns-backend-mydns -Architecture: any -Depends: pdns-server (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Provides: pdns-backend -Description: MyDNS compatibility backend for PowerDNS - PowerDNS is a versatile nameserver which supports a large number - of different backends ranging from simple zonefiles to relational - databases and load balancing/failover algorithms. - PowerDNS tries to emphasize speed and security. - . - This package contains the MyDNS compatibility backend for PowerDNS. - Package: pdns-backend-tinydns Architecture: any Depends: pdns-server (= ${binary:Version}), diff --git a/builder-support/debian/authoritative/debian-stretch/copyright b/builder-support/debian/authoritative/debian-stretch/copyright index c45339f92f..5345b6b3ab 100644 --- a/builder-support/debian/authoritative/debian-stretch/copyright +++ b/builder-support/debian/authoritative/debian-stretch/copyright @@ -48,15 +48,6 @@ Copyright: 2003 Michel Stol 2011 PowerDNS.COM BV License: GPL-2 with OpenSSL Exception -Files: modules/mydnsbackend/* -Copyright: 2011 Jonathan Oddy (Hostway UK) -License: GPL-2 with OpenSSL Exception - -Files: modules/mydnsbackend/schema.mydns.sql -Copyright: 2002-2005 Don Moore - 2007-2008 Howard Wilkinson -License: GPL-2+ - Files: modules/ldapbackend/* pdns/zone2ldap.cc Copyright: 2003-2007 Norbert Sendetzky License: GPL-2 with OpenSSL Exception diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.docs b/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.docs deleted file mode 100644 index a47a40c590..0000000000 --- a/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.docs +++ /dev/null @@ -1 +0,0 @@ -modules/mydnsbackend/schema.mydns.sql diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.install b/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.install deleted file mode 100644 index 262f35ec75..0000000000 --- a/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/pdns/libmydnsbackend.so* diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.postinst b/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.postinst deleted file mode 100644 index 1beff20037..0000000000 --- a/builder-support/debian/authoritative/debian-stretch/pdns-backend-mydns.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -dpkg-trigger pdns-server - -#DEBHELPER# - -exit 0 diff --git a/builder-support/debian/authoritative/debian-stretch/rules b/builder-support/debian/authoritative/debian-stretch/rules index fca9b48586..ee792b2627 100755 --- a/builder-support/debian/authoritative/debian-stretch/rules +++ b/builder-support/debian/authoritative/debian-stretch/rules @@ -4,7 +4,7 @@ DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # Backends -backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lmdb lua lua2 mydns remote random opendbx tinydns +backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lmdb lua lua2 remote random opendbx tinydns # Disable systemd integration on non-linux archs ifeq ($(DEB_HOST_ARCH_OS),linux) diff --git a/builder-support/debian/authoritative/ubuntu-trusty/control b/builder-support/debian/authoritative/ubuntu-trusty/control index 2f8413ba42..e31125f0cc 100644 --- a/builder-support/debian/authoritative/ubuntu-trusty/control +++ b/builder-support/debian/authoritative/ubuntu-trusty/control @@ -281,20 +281,6 @@ Description: OpenDBX backend for PowerDNS the libopendbx1-DATABASE package to allow OpenDBX to connect to the chosen database. -Package: pdns-backend-mydns -Architecture: any -Depends: pdns-server (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Provides: pdns-backend -Description: MyDNS compatibility backend for PowerDNS - PowerDNS is a versatile nameserver which supports a large number - of different backends ranging from simple zonefiles to relational - databases and load balancing/failover algorithms. - PowerDNS tries to emphasize speed and security. - . - This package contains the MyDNS compatibility backend for PowerDNS. - Package: pdns-backend-tinydns Architecture: any Depends: pdns-server (= ${binary:Version}), diff --git a/builder-support/debian/authoritative/ubuntu-trusty/copyright b/builder-support/debian/authoritative/ubuntu-trusty/copyright index c45339f92f..5345b6b3ab 100644 --- a/builder-support/debian/authoritative/ubuntu-trusty/copyright +++ b/builder-support/debian/authoritative/ubuntu-trusty/copyright @@ -48,15 +48,6 @@ Copyright: 2003 Michel Stol 2011 PowerDNS.COM BV License: GPL-2 with OpenSSL Exception -Files: modules/mydnsbackend/* -Copyright: 2011 Jonathan Oddy (Hostway UK) -License: GPL-2 with OpenSSL Exception - -Files: modules/mydnsbackend/schema.mydns.sql -Copyright: 2002-2005 Don Moore - 2007-2008 Howard Wilkinson -License: GPL-2+ - Files: modules/ldapbackend/* pdns/zone2ldap.cc Copyright: 2003-2007 Norbert Sendetzky License: GPL-2 with OpenSSL Exception diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.docs b/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.docs deleted file mode 100644 index a47a40c590..0000000000 --- a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.docs +++ /dev/null @@ -1 +0,0 @@ -modules/mydnsbackend/schema.mydns.sql diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.install b/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.install deleted file mode 100644 index 262f35ec75..0000000000 --- a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/pdns/libmydnsbackend.so* diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.postinst b/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.postinst deleted file mode 100644 index 1beff20037..0000000000 --- a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-mydns.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -dpkg-trigger pdns-server - -#DEBHELPER# - -exit 0 diff --git a/builder-support/debian/authoritative/ubuntu-trusty/rules b/builder-support/debian/authoritative/ubuntu-trusty/rules index 46654e4ddd..b766a58ad5 100755 --- a/builder-support/debian/authoritative/ubuntu-trusty/rules +++ b/builder-support/debian/authoritative/ubuntu-trusty/rules @@ -4,7 +4,7 @@ DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # Backends -backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua lua2 mydns remote random opendbx tinydns +backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua lua2 remote random opendbx tinydns # Use new build system diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec index 90096b323a..839b1415f4 100644 --- a/builder-support/specs/pdns.spec +++ b/builder-support/specs/pdns.spec @@ -141,15 +141,6 @@ BuildRequires: sqlite-devel %description backend-sqlite This package contains the SQLite backend for %{name} -%package backend-mydns -Summary: MyDNS backend for %{name} -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -%global backends %{backends} mydns - -%description backend-mydns -This package contains the MyDNS backend for %{name} - %if 0%{?rhel} >= 7 %package backend-odbc Summary: UnixODBC backend for %{name} @@ -408,10 +399,6 @@ fi %doc modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql %{_libdir}/%{name}/libgsqlite3backend.so -%files backend-mydns -%doc modules/mydnsbackend/schema.mydns.sql -%{_libdir}/%{name}/libmydnsbackend.so - %if 0%{?rhel} >= 7 %files backend-odbc %doc modules/godbcbackend/schema.mssql.sql diff --git a/configure.ac b/configure.ac index 39eac57d48..af00987fbd 100644 --- a/configure.ac +++ b/configure.ac @@ -178,7 +178,7 @@ for a in $modules $dynmodules; do godbc) PDNS_WITH_UNIXODBC ;; - mydns|gmysql) + gmysql) PDNS_WITH_MYSQL ;; gpgsql) @@ -343,7 +343,6 @@ AC_CONFIG_FILES([ modules/lmdbbackend/Makefile modules/luabackend/Makefile modules/lua2backend/Makefile - modules/mydnsbackend/Makefile modules/opendbxbackend/Makefile modules/pipebackend/Makefile modules/randombackend/Makefile diff --git a/docs/backends/index.rst b/docs/backends/index.rst index 597ff97d5d..23b8de27d5 100644 --- a/docs/backends/index.rst +++ b/docs/backends/index.rst @@ -26,8 +26,6 @@ The following table describes the supported backends and some of their capabilit +------------------------------------------------+--------+--------+-------+--------------+---------------------------------+--------------+ | :doc:`Lua2 ` | Yes | Yes | No | No | Yes | ``lua2`` | +------------------------------------------------+--------+--------+-------+--------------+---------------------------------+--------------+ -| :doc:`MyDNS ` | Yes | No | No | No | No | ``mydns`` | -+------------------------------------------------+--------+--------+-------+--------------+---------------------------------+--------------+ | :doc:`OpenDBX ` | Yes | Yes | Yes | Yes | No | ``opendbx`` | +------------------------------------------------+--------+--------+-------+--------------+---------------------------------+--------------+ | :doc:`Pipe ` | Yes | No | No | No | Partial | ``pipe`` | @@ -57,7 +55,6 @@ These backends have :doc:`features unique ` to the generic SQL back lmdb lua lua2 - mydns opendbx pipe random diff --git a/docs/backends/mydns.rst b/docs/backends/mydns.rst deleted file mode 100644 index ee9fcc178c..0000000000 --- a/docs/backends/mydns.rst +++ /dev/null @@ -1,118 +0,0 @@ -MyDNS Backend -============= - -* Native: Yes -* Master: No -* Slave: No -* Superslave: No -* Autoserial: No -* Case: Depends -* DNSSEC: No -* Disabled data: No -* Comments: No -* Module name: mydns -* Launch name: ``mydns`` - -The MyDNS backend makes PowerDNS a drop-in replacement for the -`MyDNS `__ nameserver, as it uses the same -database schema. - -Configuration Parameters ------------------------- - -.. _setting-mydns-host: - -``mydns-host`` -~~~~~~~~~~~~~~ - -Database host to connect to. - -.. _setting-mydns-port: - -``mydns-port`` -~~~~~~~~~~~~~~ - -Port on the database server to connect to. - -.. _setting-mydns-dbname: - -``mydns-dbname`` -~~~~~~~~~~~~~~~~ - -Name of the database to connect to, "mydns" by default. - -.. _setting-mydns-user: - -``mydns-user`` -~~~~~~~~~~~~~~ - -User for the database, "powerdns" by default. - -.. _setting-mydns-password: - -``mydns-password`` -~~~~~~~~~~~~~~~~~~ - -The user password. - -.. _setting-mydns-socket: - -``mydns-socket`` -~~~~~~~~~~~~~~~~ - -Unix socket to connect to the database. - -.. _setting-mydns-rr-table: - -``mydns-rr-table`` -~~~~~~~~~~~~~~~~~~ - -Name of the resource record table in the database, "rr" by default. - -.. _setting-mydns-soa-table: - -``mydns-soa-table`` -~~~~~~~~~~~~~~~~~~~ - -Name of the SOA table in the database, "soa" by default. - -.. _setting-mydns-soa-where: - -``mydns-soa-where`` -~~~~~~~~~~~~~~~~~~~ - -Additional WHERE clause for SOA, default is "1 = 1". - -.. _setting-mydns-rr-where: - -``mydns-rr-where`` -~~~~~~~~~~~~~~~~~~ - -Additional WHERE clause for resource records, default is "1 = 1". - -.. _setting-mydns-soa-active: - -``mydns-soa-active`` -~~~~~~~~~~~~~~~~~~~~ - -Use the active column in the SOA table, "yes" by default. - -.. _setting-mydns-rr-active: - -``mydns-rr-active`` -~~~~~~~~~~~~~~~~~~~ - -Use the active column in the resource record table, "yes" by default. - -.. _setting-mydns-use-minimal-ttl: - -``mydns-use-minimal-ttl`` -~~~~~~~~~~~~~~~~~~~~~~~~~ - -Setting this to 'yes' will make the backend behave like MyDNS on the TTL -values. Setting it to 'no' will make it ignore the minimal-ttl of the -zone. The default is "yes". - -Migrating from MyDNS to another SQL backend -------------------------------------------- -To use one of the :doc:`generic SQL backend `, like the :doc:`Postgresql ` or :doc:`MySQL ` backends, the data can be migratedusing the :ref:`Backend to Backend ` migration guide. diff --git a/docs/manpages/zone2sql.1.rst b/docs/manpages/zone2sql.1.rst index e3240748bb..77be30811a 100644 --- a/docs/manpages/zone2sql.1.rst +++ b/docs/manpages/zone2sql.1.rst @@ -44,8 +44,6 @@ BACKENDS --gsqlite Output in format suitable for the default configuration of the Generic SQLite3 backend. ---mydns - Output in a format suitable for the MyDNS backend. OUTPUT Options -------------- diff --git a/docs/migration.rst b/docs/migration.rst index 6c6dec24eb..8191e416c8 100644 --- a/docs/migration.rst +++ b/docs/migration.rst @@ -149,7 +149,7 @@ Syntax: ``pdnsutil b2b-migrate OLD NEW`` This tool lets you migrate data from one backend to another, it moves all data, including zones, metadata and crypto keys (if present). Some example use cases are moving from BIND-style zonefiles to SQL based, or -other way around, or moving from MyDNS to gMySQL. +other way around. Prerequisites ~~~~~~~~~~~~~ diff --git a/modules/Makefile.am b/modules/Makefile.am index f3701b7671..f0b697e7bc 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -11,7 +11,6 @@ DIST_SUBDIRS = \ lmdbbackend \ luabackend \ lua2backend \ - mydnsbackend \ opendbxbackend \ pipebackend \ randombackend \ diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am deleted file mode 100644 index 1053d24faf..0000000000 --- a/modules/mydnsbackend/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -AM_CPPFLAGS += $(MYSQL_CFLAGS) -pkglib_LTLIBRARIES = libmydnsbackend.la - -EXTRA_DIST = \ - OBJECTFILES \ - OBJECTLIBS \ - schema.mydns.sql - -dist_doc_DATA = schema.mydns.sql - -libmydnsbackend_la_SOURCES = \ - mydnsbackend.cc mydnsbackend.hh - -libmydnsbackend_la_LDFLAGS = -module -avoid-version -libmydnsbackend_la_LIBADD = \ - ../gmysqlbackend/smysql.lo \ - $(MYSQL_LIBS) diff --git a/modules/mydnsbackend/OBJECTFILES b/modules/mydnsbackend/OBJECTFILES deleted file mode 100644 index e1c69a1112..0000000000 --- a/modules/mydnsbackend/OBJECTFILES +++ /dev/null @@ -1 +0,0 @@ -mydnsbackend.lo diff --git a/modules/mydnsbackend/OBJECTLIBS b/modules/mydnsbackend/OBJECTLIBS deleted file mode 100644 index 11d431143e..0000000000 --- a/modules/mydnsbackend/OBJECTLIBS +++ /dev/null @@ -1 +0,0 @@ -$(MYSQL_LIBS) diff --git a/modules/mydnsbackend/mydnsbackend.cc b/modules/mydnsbackend/mydnsbackend.cc deleted file mode 100644 index 59971f563b..0000000000 --- a/modules/mydnsbackend/mydnsbackend.cc +++ /dev/null @@ -1,500 +0,0 @@ -/* - * This file is part of PowerDNS or dnsdist. - * Copyright -- PowerDNS.COM B.V. and its contributors - * originally authored by Jonathan Oddy - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * In addition, for the avoidance of any doubt, permission is granted to - * link this program with OpenSSL and to (re)distribute the binaries - * produced as the result of such linking. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * The schema used by MyDNS isn't suitable for retrieving results with a single - * query. This means that existing PowerDNS backends are unable to make use of - * the schema without lame hackery (or awful performance.) This module does - * the nasty lookup logic required to make use of the schema, and should be as - * tolerant as MyDNS when it comes to things being fully qualified or not. - * - * A known "bug" is that AXFRs will fail if your rr table contains invalid - * junk. I'm not sure this is really a bug, if you've decided to put free-form - * text in your data for an A record you have bigger issues. - * - * I'd advise avoiding the MyDNS schema if at all possible as the query count - * for even simple lookups is daft. It's quite trivial to craft a request - * that'll require 128 database queries to answer with a servfail! - * - * If you do not know what mydns is: http://mydns.bboy.net/ - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#include -#include -#include -#include -#include - -#include "pdns/namespaces.hh" - -#include "pdns/dns.hh" -#include "pdns/dnsbackend.hh" -#include "mydnsbackend.hh" -#include "pdns/dnspacket.hh" -#include "pdns/pdnsexception.hh" -#include "pdns/logger.hh" -#include "pdns/arguments.hh" - -#include - -static string backendName="[MyDNSbackend]"; - -MyDNSBackend::MyDNSBackend(const string &suffix) { - setArgPrefix("mydns"+suffix); - - try { - d_db = new SMySQL(getArg("dbname"), - getArg("host"), - getArgAsNum("port"), - getArg("socket"), - getArg("user"), - getArg("password")); - d_db->setLog(::arg().mustDo("query-logging")); - } - catch(SSqlException &e) { - g_log<prepare(domainIdQuery, 1); - d_domainNoIdQuery_stmt = d_db->prepare(domainNoIdQuery, 1); - d_soaQuery_stmt = d_db->prepare(soaQuery, 1); - d_allDomainsQuery_stmt = d_db->prepare(allDomainsQuery, 0); - - string listQuery = "SELECT type, data, aux, ttl, zone, name FROM `"+rrtable+"` WHERE zone = ?"; - string basicQuery = "SELECT type, data, aux, ttl, zone FROM `"+rrtable+"` WHERE zone = ? AND (name = ? OR name = ?) AND type = ?"; - string anyQuery = "(SELECT type, data, aux, ttl, zone FROM `"+rrtable+"` WHERE zone = ? AND (name = ? OR name = ?)"; - - if (!rrwhere.empty()) { - listQuery += " AND "+rrwhere; - basicQuery += " AND " + rrwhere; - anyQuery += " AND " + rrwhere; - } - - d_listQuery_stmt = d_db->prepare(listQuery, 1); - - anyQuery += ") UNION (SELECT 'SOA' AS type, CONCAT_WS(' ', ns, mbox,serial,refresh,retry,expire,minimum) AS data, '0' AS aux, ttl, id AS zone FROM `"+soatable+"` WHERE id = ? AND origin = ?"; - - if (!soawhere.empty()) { - anyQuery += " AND "+soawhere; - } - - basicQuery += " ORDER BY type,aux,data"; - anyQuery += ") ORDER BY type,aux,data"; - - d_basicQuery_stmt = d_db->prepare(basicQuery, 4); - d_anyQuery_stmt = d_db->prepare(anyQuery, 5); - } catch (SSqlException &e) { - g_log< - bind("domain_id", zoneId)-> - execute()-> - getResult(d_result)-> - reset(); - } - catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to list domain_id "+itoa(zoneId)+": "+e.txtReason()); - } - - if (d_result.empty()) - return false; // No such zone - - d_origin = d_result[0][0]; - if (d_origin[d_origin.length()-1] == '.') - d_origin.erase(d_origin.length()-1); - d_minimum = pdns_stou(d_result[0][1]); - - if (d_result.size()>1) { - g_log< - bind("domain_id", zoneId)-> - execute(); - } - catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to list domain_id "+itoa(zoneId)+": "+e.txtReason()); - } - - d_qname = ""; - return true; -} - -bool MyDNSBackend::getSOA(const DNSName& name, SOAData& soadata) { - string query; - SSqlStatement::row_t rrow; - - if (name.empty()) - return false; - - try { - d_soaQuery_stmt-> - bind("origin", name.toString())-> - execute()-> - getResult(d_result)-> - reset(); - } - catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to get soa for domain "+name.toLogString()+": "+e.txtReason()); - } - - if (d_result.empty()) { - return false; - } - - rrow = d_result[0]; - - soadata.qname = name; - soadata.domain_id = pdns_stou(rrow[0]); - soadata.hostmaster = DNSName(rrow[1]); - soadata.serial = pdns_stou(rrow[2]); - soadata.nameserver = DNSName(rrow[3]); - soadata.refresh = pdns_stou(rrow[4]); - soadata.retry = pdns_stou(rrow[5]); - soadata.expire = pdns_stou(rrow[6]); - soadata.default_ttl = pdns_stou(rrow[7]); - soadata.ttl = pdns_stou(rrow[8]); - if (d_useminimalttl) { - soadata.ttl = std::min(soadata.ttl, soadata.default_ttl); - } - soadata.db = this; - - if (d_result.size()>1) { - g_log< - bind("domain", sdom.toString())-> - execute()-> - getResult(d_result)-> - reset(); - } - catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to lookup "+qname.toLogString()+": "+e.txtReason()); - } - - if (d_result.empty() == false) { - rrow = d_result[0]; - zoneId = pdns_stou(rrow[0]); - d_origin = stripDot(rrow[1]); - d_minimum = pdns_stou(rrow[2]); - found = true; - break; - } - - } while(sdom.chopOff()); - - } else { - try { - d_domainIdQuery_stmt-> - bind("domain_id", zoneId)-> - execute()-> - getResult(d_result)-> - reset(); - } - catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to lookup "+qname.toLogString()+": "+e.txtReason()); - } - - if(d_result.empty()) { - return; // just return if zone was not found instead of throwing an error - } - - rrow = d_result[0]; - - found = true; - d_origin = stripDot(rrow[0]); - d_minimum = pdns_stou(rrow[1]); - } - - if (found) { - - if (d_result.size()>1) { - g_log< - bind("domain_id", zoneId)-> - bind("host", host)-> - bind("qname", qname.toString())-> - bind("domain_id", zoneId)-> // this is because positional arguments - bind("qname2", sdom.toString())-> - execute(); - } else { - DLOG(g_log< - bind("domain_id", zoneId)-> - bind("host", host)-> - bind("qname", qname.toString())-> - bind("qtype", qtype.getName())-> - execute(); - } - } - catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to lookup "+qname.toLogString()+": "+e.txtReason()); - } - - d_qname = qname.toString(); - } - -} - -bool MyDNSBackend::get(DNSResourceRecord &rr) { - if (d_origin.empty()) { - if (d_query_stmt) { - try { - (*d_query_stmt)->reset(); - } catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to lookup "+d_qname+": "+e.txtReason()); - } - d_query_stmt = NULL; - } - // This happens if lookup() couldn't find the zone - return false; - } - - SSqlStatement::row_t rrow; - - if ((*d_query_stmt)->hasNextRow()) { - try { - (*d_query_stmt)->nextRow(rrow); - } catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to lookup "+d_qname+": "+e.txtReason()); - } - rr.qtype=rrow[0]; - rr.content = rrow[1]; - - if(!d_qname.empty()) { - // use this to distinguish between select with 'name' field (list()) and one without - rr.qname=DNSName(d_qname); - } else { - string tmpQname = rrow[5]; - - //TODO: Refactor - if (!tmpQname.empty() && tmpQname[tmpQname.length()-1] == '.') { - tmpQname.erase(tmpQname.length()-1); // Fully qualified, nuke the last . - } else { - if (!tmpQname.empty()) { - tmpQname += "."; - } - tmpQname += d_origin; // Not fully qualified - } - rr.qname = DNSName(tmpQname); - } - - if (rr.qtype.getCode() == QType::NS || rr.qtype.getCode()==QType::MX || - rr.qtype.getCode() == QType::CNAME || rr.qtype.getCode() == QType::PTR) { - if (!rr.content.empty() && rr.content[rr.content.length()-1] == '.') { - if (rr.content.length() > 1) - rr.content.erase(rr.content.length()-1); // Fully qualified, nuke the last . - } else { - if (rr.content != ".") - rr.content += "."; - rr.content += d_origin; - } - } - - if (rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::SRV) - rr.content=rrow[2]+" "+rr.content; - - rr.ttl = pdns_stou(rrow[3]); - if (d_useminimalttl) - rr.ttl = std::min(rr.ttl, d_minimum); - rr.domain_id=pdns_stou(rrow[4]); - - rr.last_modified=0; - - return true; - } - - try { - (*d_query_stmt)->reset(); - } catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to lookup "+d_qname+": "+e.txtReason()); - } - - d_query_stmt = NULL; - - return false; -} - -void MyDNSBackend::getAllDomains(vector *domains, bool include_disabled) { - /* include_disabled is unfortunately ignored here */ - try { - d_allDomainsQuery_stmt-> - execute(); - - while(d_allDomainsQuery_stmt->hasNextRow()) { - SSqlStatement::row_t row; - DomainInfo di; - d_allDomainsQuery_stmt->nextRow(row); - - di.id = pdns_stou(row[0]); - di.zone = DNSName(row[1]); - di.serial = pdns_stou(row[2]); - di.kind = DomainInfo::Native; - di.backend = this; - - domains->push_back(di); - } - - d_allDomainsQuery_stmt-> - reset(); - } - catch (SSqlException &e) { - throw PDNSException("MyDNSBackend unable to list all domains: "+e.txtReason()); - } -} - -class MyDNSFactory : public BackendFactory { - -public: - MyDNSFactory() : BackendFactory("mydns") {} - - void declareArguments(const string &suffix = "") { - declare(suffix,"dbname","Pdns backend database name to connect to","mydns"); - declare(suffix,"user","Pdns backend user to connect as","powerdns"); - declare(suffix,"host","Pdns backend host to connect to",""); - declare(suffix,"port","Pdns backend host to connect to",""); - declare(suffix,"password","Pdns backend password to connect with",""); - declare(suffix,"socket","Pdns backend socket to connect to",""); - declare(suffix,"rr-table","Name of RR table to use","rr"); - declare(suffix,"soa-table","Name of SOA table to use","soa"); - declare(suffix,"soa-where","Additional WHERE clause for SOA","1 = 1"); - declare(suffix,"rr-where","Additional WHERE clause for RR","1 = 1"); - declare(suffix,"soa-active","Use the active column in the SOA table","yes"); - declare(suffix,"rr-active","Use the active column in the RR table","yes"); - declare(suffix,"use-minimal-ttl","Setting this to 'yes' will make the backend behave like MyDNS on the TTL values. Setting it to 'no' will make it ignore the minimal-ttl of the zone.","yes"); - } - - DNSBackend *make(const string &suffix="") { - return new MyDNSBackend(suffix); - } - -}; - -class MyDNSLoader { - -public: - MyDNSLoader() { - BackendMakers().report(new MyDNSFactory()); - g_log << Logger::Info << "[mydnsbackend] This is the mydns backend version " VERSION -#ifndef REPRODUCIBLE - << " (" __DATE__ " " __TIME__ ")" -#endif - << " reporting" << endl; - } -}; - -static MyDNSLoader mydnsloader; diff --git a/modules/mydnsbackend/mydnsbackend.hh b/modules/mydnsbackend/mydnsbackend.hh deleted file mode 100644 index 9e3db7ee65..0000000000 --- a/modules/mydnsbackend/mydnsbackend.hh +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of PowerDNS or dnsdist. - * Copyright -- PowerDNS.COM B.V. and its contributors - * originally authored by Jonathan Oddy - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * In addition, for the avoidance of any doubt, permission is granted to - * link this program with OpenSSL and to (re)distribute the binaries - * produced as the result of such linking. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifndef MYDNSBACKEND_HH -#define MYDNSBACKEND_HH - -#include -#include - -#include "pdns/namespaces.hh" - -#include - -class MyDNSBackend : public DNSBackend -{ -public: - MyDNSBackend(const string &suffix); - ~MyDNSBackend(); - - void lookup(const QType &, const DNSName &qdomain, int zoneId, DNSPacket *p=nullptr) override; - bool list(const DNSName &target, int domain_id, bool include_disabled=false) override; - bool get(DNSResourceRecord &r) override; - bool getSOA(const DNSName& name, SOAData& soadata) override; - void getAllDomains(vector *domains, bool include_disabled=false) override; - -private: - SMySQL *d_db; - - string d_qname; - string d_origin; - bool d_useminimalttl; - unsigned int d_minimum; - - SSqlStatement::result_t d_result; - - std::unique_ptr* d_query_stmt; - std::unique_ptr d_domainIdQuery_stmt; - std::unique_ptr d_domainNoIdQuery_stmt; - std::unique_ptr d_listQuery_stmt; - std::unique_ptr d_soaQuery_stmt; - std::unique_ptr d_basicQuery_stmt; - std::unique_ptr d_anyQuery_stmt; - std::unique_ptr d_allDomainsQuery_stmt; -}; - -#endif /* MYDNSBACKEND_HH */ diff --git a/modules/mydnsbackend/schema.mydns.sql b/modules/mydnsbackend/schema.mydns.sql deleted file mode 100644 index 2e85d0447e..0000000000 --- a/modules/mydnsbackend/schema.mydns.sql +++ /dev/null @@ -1,42 +0,0 @@ --- --- Table layouts for mydns 1.2.8.31 (Dec 2014) --- Copyright (C) 2002-2005 Don Moore 2007-2008 Howard Wilkinson --- --- You might create these tables with a command like: --- --- $ mydns --create-tables | mysql -hHOST -p -uUSER DATABASE --- --- Originally licensed under the GNU GPLv2 or higher - --- --- Table structure for table 'soa' (zones of authority) --- -CREATE TABLE IF NOT EXISTS soa ( - id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - origin CHAR(255) NOT NULL, - ns CHAR(255) NOT NULL, - mbox CHAR(255) NOT NULL, - serial INT UNSIGNED NOT NULL default '1', - refresh INT UNSIGNED NOT NULL default '28800', - retry INT UNSIGNED NOT NULL default '7200', - expire INT UNSIGNED NOT NULL default '604800', - minimum INT UNSIGNED NOT NULL default '86400', - ttl INT UNSIGNED NOT NULL default '86400', - active ENUM('Y', 'N') NOT NULL DEFAULT 'Y', - UNIQUE KEY (origin) -) Engine=MyISAM; - --- --- Table structure for table 'rr' (resource records) --- -CREATE TABLE IF NOT EXISTS rr ( - id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - zone INT UNSIGNED NOT NULL, - name CHAR(200) NOT NULL, - data VARBINARY(128) NOT NULL, - aux INT UNSIGNED NOT NULL, - ttl INT UNSIGNED NOT NULL default '86400', - type ENUM('A','AAAA','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT'), - active ENUM('Y', 'N') NOT NULL DEFAULT 'Y', - UNIQUE KEY rr (zone,name,type,data,aux,active) -) Engine=MyISAM; diff --git a/pdns/zone2sql.cc b/pdns/zone2sql.cc index 2bcb7df148..5b86fa3410 100644 --- a/pdns/zone2sql.cc +++ b/pdns/zone2sql.cc @@ -50,7 +50,7 @@ StatBag S; -enum dbmode_t {MYSQL, POSTGRES, SQLITE, MYDNS}; +enum dbmode_t {MYSQL, POSTGRES, SQLITE}; static dbmode_t g_mode; static bool g_intransaction; static int g_numRecords; @@ -99,13 +99,13 @@ static void startNewTransaction() if(g_mode==POSTGRES) { cout<<"COMMIT WORK;"< parts; - stringtok(parts, content); - - cout<<"INSERT INTO soa(origin, ns, mbox, serial, refresh, retry, expire, minimum, ttl) VALUES("<< - sqlstr(toLower(zoneNameDot))<<", "< pdns-mydns.conf << __EOF__ -module-dir=./modules -launch=mydns -mydns-dbname=$MYDNSDB -mydns-user=$MYDNSUSER -mydns-host=$MYDNSHOST -mydns-password=$MYDNSPASSWD -__EOF__ - $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \ - --config-dir=. --config-name=mydns \ - --no-shuffle --master \ - --cache-ttl=0 --dname-processing \ - --mydns-rr-active=no --mydns-soa-active=no --mydns-use-minimal-ttl=no & - skipreasons="nodnssec noent nodyndns nometa noaxfr noalias" - ;; - - *) - nocontext=yes -esac diff --git a/regression-tests/modules/libmydnsbackend.so b/regression-tests/modules/libmydnsbackend.so deleted file mode 120000 index 16d824b48c..0000000000 --- a/regression-tests/modules/libmydnsbackend.so +++ /dev/null @@ -1 +0,0 @@ -../../modules/mydnsbackend/.libs/libmydnsbackend.so \ No newline at end of file diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop index 389f42e6f4..3fd6f837b3 100755 --- a/regression-tests/start-test-stop +++ b/regression-tests/start-test-stop @@ -50,7 +50,6 @@ godbc_sqlite3-nodnssec godbc_sqlite3 godbc_sqlite3-nsec3 godbc_sqlite3-nsec3-opt 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 remotebackend-pipe remotebackend-unix remotebackend-http remotebackend-zeromq remotebackend-pipe-dnssec remotebackend-unix-dnssec remotebackend-http-dnssec remotebackend-zeromq-dnssec diff --git a/regression-tests/tests/basic-eui48/fail.mydns b/regression-tests/tests/basic-eui48/fail.mydns deleted file mode 100644 index 634c863dde..0000000000 --- a/regression-tests/tests/basic-eui48/fail.mydns +++ /dev/null @@ -1 +0,0 @@ -MYDNS backend does not support EUI48 record type. diff --git a/regression-tests/tests/basic-eui64/fail.mydns b/regression-tests/tests/basic-eui64/fail.mydns deleted file mode 100644 index 634c863dde..0000000000 --- a/regression-tests/tests/basic-eui64/fail.mydns +++ /dev/null @@ -1 +0,0 @@ -MYDNS backend does not support EUI48 record type. diff --git a/regression-tests/tests/basic-loc/fail.mydns b/regression-tests/tests/basic-loc/fail.mydns deleted file mode 100644 index 599e152f22..0000000000 --- a/regression-tests/tests/basic-loc/fail.mydns +++ /dev/null @@ -1 +0,0 @@ -MYDNS backend does not support LOC record type. diff --git a/regression-tests/tests/basic-mb-resolution/skip.mydns b/regression-tests/tests/basic-mb-resolution/skip.mydns deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/regression-tests/tests/basic-mg-resolution/skip.mydns b/regression-tests/tests/basic-mg-resolution/skip.mydns deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/regression-tests/tests/basic-mr-resolution/skip.mydns b/regression-tests/tests/basic-mr-resolution/skip.mydns deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/regression-tests/tests/dname-self/fail.mydns b/regression-tests/tests/dname-self/fail.mydns deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/regression-tests/tests/dname/fail.mydns b/regression-tests/tests/dname/fail.mydns deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/regression-tests/tests/double/fail.mydns b/regression-tests/tests/double/fail.mydns deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/regression-tests/tests/ds-at-secure-delegation/fail.mydns b/regression-tests/tests/ds-at-secure-delegation/fail.mydns deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/regression-tests/tests/test-urc/fail.mydns b/regression-tests/tests/test-urc/fail.mydns deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/regression-tests/tests/very-long-txt/fail.mydns b/regression-tests/tests/very-long-txt/fail.mydns deleted file mode 100644 index 919c014496..0000000000 --- a/regression-tests/tests/very-long-txt/fail.mydns +++ /dev/null @@ -1 +0,0 @@ -MYDNS has only 128 chars of data.