current/SOURCES/bind-9.11.4-P1-sdb.patch

diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.4-P1/bin/Makefile.in bind-9.11.4-P1-sdb/bin/Makefile.in
--- bind-9.11.4-P1/bin/Makefile.in      2018-07-24 19:24:11.000000000 +0200
+++ bind-9.11.4-P1-sdb/bin/Makefile.in  2018-08-12 16:48:24.461627037 +0200
@@ -11,8 +11,8 @@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
 
-SUBDIRS =      named rndc dig delv dnssec tools nsupdate check confgen \
-               @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
+SUBDIRS =      named named-sdb rndc dig delv dnssec tools nsupdate check confgen \
+               @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools tests
 TARGETS =
 
 @BIND9_MAKE_RULES@
diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.4-P1/bin/named/Makefile.in bind-9.11.4-P1-sdb/bin/named/Makefile.in
--- bind-9.11.4-P1/bin/named/Makefile.in        2018-08-12 16:48:03.849768245 +0200
+++ bind-9.11.4-P1-sdb/bin/named/Makefile.in    2018-08-12 16:13:46.507752345 +0200
@@ -45,9 +45,9 @@
 CINCLUDES =    -I${srcdir}/include -I${srcdir}/unix/include -I. \
                ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
                ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
-               ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
+               @DST_OPENSSL_INC@
 
-CDEFINES =      @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@
+CDEFINES =      @CRYPTO@
 
 CWARNINGS =
 
@@ -71,11 +71,11 @@
 
 LIBS =         ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
                ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
-               ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
+               @LIBS@
 
 NOSYMLIBS =    ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
                ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
-               ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
+               @LIBS@
 
 SUBDIRS =      unix
 
@@ -90,8 +90,7 @@
                tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
                zoneconf.@O@ \
                lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
-               lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
-               ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
+               lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
 
 UOBJS =                unix/os.@O@ unix/dlz_dlopen_driver.@O@
 
@@ -106,8 +105,7 @@
                tkeyconf.c tsigconf.c update.c xfrout.c \
                zoneconf.c \
                lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
-               lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
-               ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
+               lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
 
 MANPAGES =     named.8 lwresd.8 named.conf.5
 
@@ -195,7 +193,5 @@
        rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
        ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
 
-@DLZ_DRIVER_RULES@
-
 named-symtbl.@O@: named-symtbl.c
        ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.4-P1/bin/named-sdb/main.c bind-9.11.4-P1-sdb/bin/named-sdb/main.c
--- bind-9.11.4-P1/bin/named-sdb/main.c 2018-08-12 16:48:03.859769457 +0200
+++ bind-9.11.4-P1-sdb/bin/named-sdb/main.c     2018-08-12 11:03:46.539691492 +0200
@@ -91,6 +91,10 @@
  * Include header files for database drivers here.
  */
 /* #include "xxdb.h" */
+#include "ldapdb.h"
+#include "pgsqldb.h"
+#include "sqlitedb.h"
+#include "dirdb.h"
 
 #ifdef CONTRIB_DLZ
 /*
@@ -1061,6 +1065,11 @@
                ns_main_earlyfatal("isc_app_start() failed: %s",
                                   isc_result_totext(result));
 
+       ldapdb_clear();
+       pgsqldb_clear();
+       dirdb_clear();
+       sqlitedb_clear();
+
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
                      ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
                      ns_g_product, ns_g_version,
@@ -1261,6 +1270,75 @@
                                   isc_result_totext(result));
 #endif
 
+        result = ldapdb_init();
+        if (result != ISC_R_SUCCESS)
+        {
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_ERROR, 
+                          "SDB ldap module initialisation failed: %s.",
+                          isc_result_totext(result)
+                );
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_ERROR, 
+                          "SDB ldap zone database will be unavailable."
+                );
+        }else
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_NOTICE, "SDB ldap zone database module loaded."
+                         );
+
+        result = pgsqldb_init();
+        if (result != ISC_R_SUCCESS)
+        {
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_ERROR, 
+                          "SDB pgsql module initialisation failed: %s.",
+                          isc_result_totext(result)
+                );
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_ERROR, 
+                          "SDB pgsql zone database will be unavailable."
+                );
+        }else
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
+                         );
+
+        result = sqlitedb_init();
+        if (result != ISC_R_SUCCESS)
+        {
+             isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_ERROR, 
+                          "SDB sqlite3 module initialisation failed: %s.",
+                          isc_result_totext(result)
+                );
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_ERROR, 
+                          "SDB sqlite3 zone database will be unavailable."
+                );
+        }else
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
+                         );
+
+        result = dirdb_init();
+        if (result != ISC_R_SUCCESS)
+        {
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_ERROR, 
+                          "SDB directory DB module initialisation failed: %s.",
+                          isc_result_totext(result)
+                );
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_ERROR, 
+                          "SDB directory DB zone database will be unavailable."
+                );
+        }else
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+                          ISC_LOG_NOTICE, "SDB directory DB zone database module loaded."
+                         );
+
+
        ns_server_create(ns_g_mctx, &ns_g_server);
 
 #ifdef HAVE_LIBSECCOMP
@@ -1303,6 +1381,11 @@
 
        dns_name_destroy();
 
+       ldapdb_clear();
+       pgsqldb_clear();
+       sqlitedb_clear();
+       dirdb_clear();
+
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
                      ISC_LOG_NOTICE, "exiting");
        ns_log_shutdown();
diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.4-P1/bin/named-sdb/Makefile.in bind-9.11.4-P1-sdb/bin/named-sdb/Makefile.in
--- bind-9.11.4-P1/bin/named-sdb/Makefile.in    2018-08-12 16:48:03.856769093 +0200
+++ bind-9.11.4-P1-sdb/bin/named-sdb/Makefile.in        2018-08-12 11:03:46.539691492 +0200
@@ -30,10 +30,10 @@
 #
 # Add database drivers here.
 #
-DBDRIVER_OBJS =
-DBDRIVER_SRCS =
+DBDRIVER_OBJS =        ldapdb.@O@ pgsqldb.@O@ sqlitedb.@O@ dirdb.@O@
+DBDRIVER_SRCS =        ldapdb.c pgsqldb.c sqlitedb.c dirdb.c
 DBDRIVER_INCLUDES =
-DBDRIVER_LIBS =
+DBDRIVER_LIBS =        -lldap -llber -lsqlite3 -lpq
 
 DLZ_DRIVER_DIR =       ${top_srcdir}/contrib/dlz/drivers
 
@@ -79,7 +79,7 @@
 
 SUBDIRS =      unix
 
-TARGETS =      named@EXEEXT@ lwresd@EXEEXT@
+TARGETS =      named-sdb@EXEEXT@
 
 GEOIPLINKOBJS = geoip.@O@
 
@@ -146,7 +146,7 @@
                -DPRODUCT=\"${PRODUCT}\" \
                -DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
 
-named@EXEEXT@: ${OBJS} ${DEPLIBS}
+named-sdb@EXEEXT@: ${OBJS} ${DEPLIBS}
        export MAKE_SYMTABLE="yes"; \
        export BASEOBJS="${OBJS} ${UOBJS}"; \
        ${FINALBUILDCMD}
@@ -173,8 +173,6 @@
 
 installdirs:
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
-       $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install-man5: named.conf.5
        ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
@@ -184,16 +182,11 @@
 
 install-man: install-man5 install-man8
 
-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
-       ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
-       (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
+install:: ${TARGETS} installdirs
+       ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
 
 uninstall::
-       rm -f ${DESTDIR}${mandir}/man5/named.conf.5
-       rm -f ${DESTDIR}${mandir}/man8/lwresd.8
-       rm -f ${DESTDIR}${mandir}/man8/named.8
-       rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
-       ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
+       ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-sdb@EXEEXT@
 
 @DLZ_DRIVER_RULES@
 
diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.4-P1/bin/sdb_tools/Makefile.in bind-9.11.4-P1-sdb/bin/sdb_tools/Makefile.in
--- bind-9.11.4-P1/bin/sdb_tools/Makefile.in    2018-07-05 22:33:11.856511233 +0200
+++ bind-9.11.4-P1-sdb/bin/sdb_tools/Makefile.in        2018-08-12 11:03:46.539691492 +0200
@@ -32,11 +32,11 @@
 LIBS =         ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
                ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
 
-TARGETS =      zone2ldap@EXEEXT@ zonetodb@EXEEXT@
+TARGETS =      zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
 
-OBJS   =       zone2ldap.@O@ zonetodb.@O@
+OBJS   =       zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
 
-SRCS    =       zone2ldap.c zonetodb.c
+SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
 
 MANPAGES =      zone2ldap.1
 
@@ -50,6 +50,9 @@
 zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
 
+zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
+
 clean distclean manclean maintainer-clean::
        rm -f ${TARGETS} ${OBJS}
 
@@ -60,4 +63,5 @@
 install:: ${TARGETS} installdirs
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
        ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
+       ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
        ${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.4-P1/configure.in bind-9.11.4-P1-sdb/configure.in
--- bind-9.11.4-P1/configure.in 2018-08-12 16:48:03.848768124 +0200
+++ bind-9.11.4-P1-sdb/configure.in     2018-08-12 16:12:14.546091010 +0200
@@ -5436,6 +5436,8 @@
        bin/dnssec/Makefile
        bin/named/Makefile
        bin/named/unix/Makefile
+       bin/named-sdb/Makefile
+       bin/named-sdb/unix/Makefile
        bin/nsupdate/Makefile
        bin/pkcs11/Makefile
        bin/python/Makefile
@@ -5460,6 +5462,7 @@
        bin/python/isc/tests/dnskey_test.py
        bin/python/isc/tests/policy_test.py
        bin/rndc/Makefile
+       bin/sdb_tools/Makefile
        bin/tests/Makefile
        bin/tests/headerdep_test.sh
        bin/tests/optional/Makefile
diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.4-P1/lib/dns/dst_internal.h bind-9.11.4-P1-sdb/lib/dns/dst_internal.h
--- bind-9.11.4-P1/lib/dns/dst_internal.h       2018-08-12 16:48:03.851768487 +0200
+++ bind-9.11.4-P1-sdb/lib/dns/dst_internal.h   2018-08-12 11:03:20.171752035 +0200
@@ -59,9 +59,6 @@
 #include <openssl/objects.h>
 #include <openssl/rsa.h>
 #endif
-#if PKCS11CRYPTO
-#include <pk11/pk11.h>
-#endif
 
 ISC_LANG_BEGINDECLS
 
diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.4-P1/lib/isc/include/pk11/internal.h bind-9.11.4-P1-sdb/lib/isc/include/pk11/internal.h
--- bind-9.11.4-P1/lib/isc/include/pk11/internal.h      2018-08-12 16:48:03.851768487 +0200
+++ bind-9.11.4-P1-sdb/lib/isc/include/pk11/internal.h  2018-08-12 11:03:20.185752130 +0200
@@ -13,8 +13,6 @@
 #ifndef PK11_INTERNAL_H
 #define PK11_INTERNAL_H 1
 
-#include <pk11/pk11.h>
-
 /*! \file pk11/internal.h */
 
 ISC_LANG_BEGINDECLS
1	diff -Naur -x '~' -x '.rej' -x '*.orig' bind-9.11.4-P1/bin/Makefile.in bind-9.11.4-P1-sdb/bin/Makefile.in
2	--- bind-9.11.4-P1/bin/Makefile.in 2018-07-24 19:24:11.000000000 +0200
3	+++ bind-9.11.4-P1-sdb/bin/Makefile.in 2018-08-12 16:48:24.461627037 +0200
4	@@ -11,8 +11,8 @@
5	VPATH = @srcdir@
6	top_srcdir = @top_srcdir@
7
8	-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \
9	- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
10	+SUBDIRS = named named-sdb rndc dig delv dnssec tools nsupdate check confgen \
11	+ @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools tests
12	TARGETS =
13
14	@BIND9_MAKE_RULES@
15	diff -Naur -x '~' -x '.rej' -x '*.orig' bind-9.11.4-P1/bin/named/Makefile.in bind-9.11.4-P1-sdb/bin/named/Makefile.in
16	--- bind-9.11.4-P1/bin/named/Makefile.in 2018-08-12 16:48:03.849768245 +0200
17	+++ bind-9.11.4-P1-sdb/bin/named/Makefile.in 2018-08-12 16:13:46.507752345 +0200
18	@@ -45,9 +45,9 @@
19	CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
20	${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
21	${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
22	- ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
23	+ @DST_OPENSSL_INC@
24
25	-CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@
26	+CDEFINES = @CRYPTO@
27
28	CWARNINGS =
29
30	@@ -71,11 +71,11 @@
31
32	LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
33	${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
34	- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
35	+ @LIBS@
36
37	NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
38	${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
39	- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
40	+ @LIBS@
41
42	SUBDIRS = unix
43
44	@@ -90,8 +90,7 @@
45	tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
46	zoneconf.@O@ \
47	lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
48	- lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
49	- ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
50	+ lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
51
52	UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
53
54	@@ -106,8 +105,7 @@
55	tkeyconf.c tsigconf.c update.c xfrout.c \
56	zoneconf.c \
57	lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
58	- lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
59	- ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
60	+ lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
61
62	MANPAGES = named.8 lwresd.8 named.conf.5
63
64	@@ -195,7 +193,5 @@
65	rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
66	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
67
68	-@DLZ_DRIVER_RULES@
69	-
70	named-symtbl.@O@: named-symtbl.c
71	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
72	diff -Naur -x '~' -x '.rej' -x '*.orig' bind-9.11.4-P1/bin/named-sdb/main.c bind-9.11.4-P1-sdb/bin/named-sdb/main.c
73	--- bind-9.11.4-P1/bin/named-sdb/main.c 2018-08-12 16:48:03.859769457 +0200
74	+++ bind-9.11.4-P1-sdb/bin/named-sdb/main.c 2018-08-12 11:03:46.539691492 +0200
75	@@ -91,6 +91,10 @@
76	* Include header files for database drivers here.
77	*/
78	/* #include "xxdb.h" */
79	+#include "ldapdb.h"
80	+#include "pgsqldb.h"
81	+#include "sqlitedb.h"
82	+#include "dirdb.h"
83
84	#ifdef CONTRIB_DLZ
85	/*
86	@@ -1061,6 +1065,11 @@
87	ns_main_earlyfatal("isc_app_start() failed: %s",
88	isc_result_totext(result));
89
90	+ ldapdb_clear();
91	+ pgsqldb_clear();
92	+ dirdb_clear();
93	+ sqlitedb_clear();
94	+
95	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
96	ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
97	ns_g_product, ns_g_version,
98	@@ -1261,6 +1270,75 @@
99	isc_result_totext(result));
100	#endif
101
102	+ result = ldapdb_init();
103	+ if (result != ISC_R_SUCCESS)
104	+ {
105	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
106	+ ISC_LOG_ERROR,
107	+ "SDB ldap module initialisation failed: %s.",
108	+ isc_result_totext(result)
109	+ );
110	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
111	+ ISC_LOG_ERROR,
112	+ "SDB ldap zone database will be unavailable."
113	+ );
114	+ }else
115	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
116	+ ISC_LOG_NOTICE, "SDB ldap zone database module loaded."
117	+ );
118	+
119	+ result = pgsqldb_init();
120	+ if (result != ISC_R_SUCCESS)
121	+ {
122	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
123	+ ISC_LOG_ERROR,
124	+ "SDB pgsql module initialisation failed: %s.",
125	+ isc_result_totext(result)
126	+ );
127	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
128	+ ISC_LOG_ERROR,
129	+ "SDB pgsql zone database will be unavailable."
130	+ );
131	+ }else
132	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
133	+ ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
134	+ );
135	+
136	+ result = sqlitedb_init();
137	+ if (result != ISC_R_SUCCESS)
138	+ {
139	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
140	+ ISC_LOG_ERROR,
141	+ "SDB sqlite3 module initialisation failed: %s.",
142	+ isc_result_totext(result)
143	+ );
144	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
145	+ ISC_LOG_ERROR,
146	+ "SDB sqlite3 zone database will be unavailable."
147	+ );
148	+ }else
149	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
150	+ ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
151	+ );
152	+
153	+ result = dirdb_init();
154	+ if (result != ISC_R_SUCCESS)
155	+ {
156	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
157	+ ISC_LOG_ERROR,
158	+ "SDB directory DB module initialisation failed: %s.",
159	+ isc_result_totext(result)
160	+ );
161	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
162	+ ISC_LOG_ERROR,
163	+ "SDB directory DB zone database will be unavailable."
164	+ );
165	+ }else
166	+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
167	+ ISC_LOG_NOTICE, "SDB directory DB zone database module loaded."
168	+ );
169	+
170	+
171	ns_server_create(ns_g_mctx, &ns_g_server);
172
173	#ifdef HAVE_LIBSECCOMP
174	@@ -1303,6 +1381,11 @@
175
176	dns_name_destroy();
177
178	+ ldapdb_clear();
179	+ pgsqldb_clear();
180	+ sqlitedb_clear();
181	+ dirdb_clear();
182	+
183	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
184	ISC_LOG_NOTICE, "exiting");
185	ns_log_shutdown();
186	diff -Naur -x '~' -x '.rej' -x '*.orig' bind-9.11.4-P1/bin/named-sdb/Makefile.in bind-9.11.4-P1-sdb/bin/named-sdb/Makefile.in
187	--- bind-9.11.4-P1/bin/named-sdb/Makefile.in 2018-08-12 16:48:03.856769093 +0200
188	+++ bind-9.11.4-P1-sdb/bin/named-sdb/Makefile.in 2018-08-12 11:03:46.539691492 +0200
189	@@ -30,10 +30,10 @@
190	#
191	# Add database drivers here.
192	#
193	-DBDRIVER_OBJS =
194	-DBDRIVER_SRCS =
195	+DBDRIVER_OBJS = ldapdb.@O@ pgsqldb.@O@ sqlitedb.@O@ dirdb.@O@
196	+DBDRIVER_SRCS = ldapdb.c pgsqldb.c sqlitedb.c dirdb.c
197	DBDRIVER_INCLUDES =
198	-DBDRIVER_LIBS =
199	+DBDRIVER_LIBS = -lldap -llber -lsqlite3 -lpq
200
201	DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
202
203	@@ -79,7 +79,7 @@
204
205	SUBDIRS = unix
206
207	-TARGETS = named@EXEEXT@ lwresd@EXEEXT@
208	+TARGETS = named-sdb@EXEEXT@
209
210	GEOIPLINKOBJS = geoip.@O@
211
212	@@ -146,7 +146,7 @@
213	-DPRODUCT=\"${PRODUCT}\" \
214	-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
215
216	-named@EXEEXT@: ${OBJS} ${DEPLIBS}
217	+named-sdb@EXEEXT@: ${OBJS} ${DEPLIBS}
218	export MAKE_SYMTABLE="yes"; \
219	export BASEOBJS="${OBJS} ${UOBJS}"; \
220	${FINALBUILDCMD}
221	@@ -173,8 +173,6 @@
222
223	installdirs:
224	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
225	- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
226	- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
227
228	install-man5: named.conf.5
229	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
230	@@ -184,16 +182,11 @@
231
232	install-man: install-man5 install-man8
233
234	-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
235	- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
236	- (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
237	+install:: ${TARGETS} installdirs
238	+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
239
240	uninstall::
241	- rm -f ${DESTDIR}${mandir}/man5/named.conf.5
242	- rm -f ${DESTDIR}${mandir}/man8/lwresd.8
243	- rm -f ${DESTDIR}${mandir}/man8/named.8
244	- rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
245	- ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
246	+ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named-sdb@EXEEXT@
247
248	@DLZ_DRIVER_RULES@
249
250	diff -Naur -x '~' -x '.rej' -x '*.orig' bind-9.11.4-P1/bin/sdb_tools/Makefile.in bind-9.11.4-P1-sdb/bin/sdb_tools/Makefile.in
251	--- bind-9.11.4-P1/bin/sdb_tools/Makefile.in 2018-07-05 22:33:11.856511233 +0200
252	+++ bind-9.11.4-P1-sdb/bin/sdb_tools/Makefile.in 2018-08-12 11:03:46.539691492 +0200
253	@@ -32,11 +32,11 @@
254	LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
255	${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
256
257	-TARGETS = zone2ldap@EXEEXT@ zonetodb@EXEEXT@
258	+TARGETS = zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
259
260	-OBJS = zone2ldap.@O@ zonetodb.@O@
261	+OBJS = zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
262
263	-SRCS = zone2ldap.c zonetodb.c
264	+SRCS = zone2ldap.c zonetodb.c zone2sqlite.c
265
266	MANPAGES = zone2ldap.1
267
268	@@ -50,6 +50,9 @@
269	zonetodb@EXEEXT@: zonetodb.@O@ ${DEPLIBS}
270	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
271
272	+zone2sqlite@EXEEXT@: zone2sqlite.@O@ ${DEPLIBS}
273	+ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
274	+
275	clean distclean manclean maintainer-clean::
276	rm -f ${TARGETS} ${OBJS}
277
278	@@ -60,4 +63,5 @@
279	install:: ${TARGETS} installdirs
280	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
281	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@ ${DESTDIR}${sbindir}
282	+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
283	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
284	diff -Naur -x '~' -x '.rej' -x '*.orig' bind-9.11.4-P1/configure.in bind-9.11.4-P1-sdb/configure.in
285	--- bind-9.11.4-P1/configure.in 2018-08-12 16:48:03.848768124 +0200
286	+++ bind-9.11.4-P1-sdb/configure.in 2018-08-12 16:12:14.546091010 +0200
287	@@ -5436,6 +5436,8 @@
288	bin/dnssec/Makefile
289	bin/named/Makefile
290	bin/named/unix/Makefile
291	+ bin/named-sdb/Makefile
292	+ bin/named-sdb/unix/Makefile
293	bin/nsupdate/Makefile
294	bin/pkcs11/Makefile
295	bin/python/Makefile
296	@@ -5460,6 +5462,7 @@
297	bin/python/isc/tests/dnskey_test.py
298	bin/python/isc/tests/policy_test.py
299	bin/rndc/Makefile
300	+ bin/sdb_tools/Makefile
301	bin/tests/Makefile
302	bin/tests/headerdep_test.sh
303	bin/tests/optional/Makefile
304	diff -Naur -x '~' -x '.rej' -x '*.orig' bind-9.11.4-P1/lib/dns/dst_internal.h bind-9.11.4-P1-sdb/lib/dns/dst_internal.h
305	--- bind-9.11.4-P1/lib/dns/dst_internal.h 2018-08-12 16:48:03.851768487 +0200
306	+++ bind-9.11.4-P1-sdb/lib/dns/dst_internal.h 2018-08-12 11:03:20.171752035 +0200
307	@@ -59,9 +59,6 @@
308	#include <openssl/objects.h>
309	#include <openssl/rsa.h>
310	#endif
311	-#if PKCS11CRYPTO
312	-#include <pk11/pk11.h>
313	-#endif
314
315	ISC_LANG_BEGINDECLS
316
317	diff -Naur -x '~' -x '.rej' -x '*.orig' bind-9.11.4-P1/lib/isc/include/pk11/internal.h bind-9.11.4-P1-sdb/lib/isc/include/pk11/internal.h
318	--- bind-9.11.4-P1/lib/isc/include/pk11/internal.h 2018-08-12 16:48:03.851768487 +0200
319	+++ bind-9.11.4-P1-sdb/lib/isc/include/pk11/internal.h 2018-08-12 11:03:20.185752130 +0200
320	@@ -13,8 +13,6 @@
321	#ifndef PK11_INTERNAL_H
322	#define PK11_INTERNAL_H 1
323
324	-#include <pk11/pk11.h>
325	-
326	/! \file pk11/internal.h /
327
328	ISC_LANG_BEGINDECLS