From 5acac71f200f380b95883ee572bacfaa8be169bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 21 Sep 2021 10:56:05 +0200 Subject: [PATCH 1/2] Remove the DLZ driver documentation Remove the last traces of static DLZ drivers from ARM. --- doc/arm/dlz.rst | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/doc/arm/dlz.rst b/doc/arm/dlz.rst index 1992a35653..e0e609dceb 100644 --- a/doc/arm/dlz.rst +++ b/doc/arm/dlz.rst @@ -15,24 +15,10 @@ Dynamically Loadable Zones (DLZ) Dynamically Loadable Zones (DLZ) are an extension to BIND 9 that allows zone data to be retrieved directly from an external database. There is -no required format or schema. DLZ drivers exist for several different -database backends, including PostgreSQL, MySQL, and LDAP, and can be +no required format or schema. DLZ modules exist for several different +database backends, including MySQL and LDAP, and can be written for any other. -Historically, DLZ drivers had to be statically linked with the ``named`` -binary and were turned on via a configure option at compile time (for -example, ``configure --with-dlz-ldap``). The drivers -provided in the BIND 9 tarball in ``contrib/dlz/drivers`` are still -linked this way. - -In BIND 9.8 and higher, it is possible to link some DLZ modules -dynamically at runtime, via the DLZ "dlopen" driver, which acts as a -generic wrapper around a shared object implementing the DLZ API. The -"dlopen" driver is linked into ``named`` by default, so configure -options are no longer necessary when using these dynamically linkable -drivers; they are still needed for the older drivers in -``contrib/dlz/drivers``. - The DLZ module provides data to ``named`` in text format, which is then converted to DNS wire format by ``named``. This conversion, and the lack of any internal caching, places significant @@ -87,7 +73,7 @@ backend storage of redirection rules: }; -Sample DLZ Driver +Sample DLZ Module ~~~~~~~~~~~~~~~~~ For guidance in the implementation of DLZ modules, the directory From c478c7776359da4d52544a95ef84ba3b297524b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 21 Sep 2021 10:56:42 +0200 Subject: [PATCH 2/2] Remove CONTRIB_DLZ traces from bin/named/main.c The named main.c had leftovers guarded by CONTRIB_DLZ macro which has been removed. This commit removes the dead code surrounded by ifdef CONTRIB_DLZ. --- bin/named/main.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/bin/named/main.c b/bin/named/main.c index bc43aa1bbc..72b6166329 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -106,13 +106,6 @@ */ /* #include "xxdb.h" */ -#ifdef CONTRIB_DLZ -/* - * Include contributed DLZ drivers if appropriate. - */ -#include -#endif /* ifdef CONTRIB_DLZ */ - /* * The maximum number of stack frames to dump on assertion failure. */ @@ -1226,17 +1219,6 @@ setup(void) { isc_result_totext(result)); } -#if CONTRIB_DLZ - /* - * Register any other contributed DLZ drivers. - */ - result = dlz_drivers_init(); - if (result != ISC_R_SUCCESS) { - named_main_earlyfatal("dlz_drivers_init() failed: %s", - isc_result_totext(result)); - } -#endif /* if CONTRIB_DLZ */ - named_server_create(named_g_mctx, &named_g_server); ENSURE(named_g_server != NULL); sctx = named_g_server->sctx; @@ -1302,12 +1284,6 @@ cleanup(void) { */ /* xxdb_clear(); */ -#ifdef CONTRIB_DLZ - /* - * Unregister contributed DLZ drivers. - */ - dlz_drivers_clear(); -#endif /* ifdef CONTRIB_DLZ */ /* * Unregister "dlopen" DLZ driver. */