Tomas Hozza 4fa997
From dc6de005ec4b5488ca4a8db8203b3ce582b62e00 Mon Sep 17 00:00:00 2001
Tomas Hozza 4fa997
From: Tomas Hozza <thozza@redhat.com>
Tomas Hozza 4fa997
Date: Mon, 24 Nov 2014 13:44:55 +0100
Tomas Hozza 4fa997
Subject: [PATCH] distribute SDB
Tomas Hozza 4fa997
Tomas Hozza 4fa997
Signed-off-by: Tomas Hozza <thozza@redhat.com>
Tomas Hozza 4fa997
---
Tomas Hozza 4fa997
 bin/Makefile.in           |  4 +--
Tomas Hozza 4fa997
 bin/named-sdb/Makefile.in | 22 +++++--------
Tomas Hozza 4fa997
 bin/named-sdb/main.c      | 83 +++++++++++++++++++++++++++++++++++++++++++++++
Tomas Hozza 4fa997
 bin/named/Makefile.in     | 16 ++++-----
Tomas Hozza 4fa997
 bin/sdb_tools/Makefile.in | 10 ++++--
Tomas Hozza 4fa997
 configure.in              |  3 ++
Tomas Hozza 4fa997
 6 files changed, 109 insertions(+), 29 deletions(-)
Tomas Hozza 4fa997
Tomas Hozza 4fa997
diff --git a/bin/Makefile.in b/bin/Makefile.in
Tomas Hozza 4fa997
index 7654169..b4c9c03 100644
Tomas Hozza 4fa997
--- a/bin/Makefile.in
Tomas Hozza 4fa997
+++ b/bin/Makefile.in
Adam Tkac 2fc1c6
@@ -19,8 +19,8 @@ srcdir =	@srcdir@
Adam Tkac f12e46
 VPATH =		@srcdir@
Adam Tkac f12e46
 top_srcdir =	@top_srcdir@
Adam Tkac f12e46
 
Tomas Hozza 4fa997
-SUBDIRS =	named named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools tests nsupdate \
Adam Tkac d6323c
-		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
Tomas Hozza 4fa997
+SUBDIRS =	named named-sdb named-pkcs11 rndc dig delv dnssec dnssec-pkcs11 tools tests nsupdate \
Adam Tkac d6323c
+		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools
Adam Tkac f12e46
 TARGETS =
Adam Tkac f12e46
 
Adam Tkac f12e46
 @BIND9_MAKE_RULES@
Tomas Hozza 4fa997
diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
Tomas Hozza 4fa997
index ba5ec3c..d7ac259 100644
Tomas Hozza 4fa997
--- a/bin/named-sdb/Makefile.in
Tomas Hozza 4fa997
+++ b/bin/named-sdb/Makefile.in
Tomas Hozza 4fa997
@@ -34,10 +34,10 @@ top_srcdir =	@top_srcdir@
Tomas Hozza 4fa997
 #
Tomas Hozza 4fa997
 # Add database drivers here.
Tomas Hozza 4fa997
 #
Tomas Hozza 4fa997
-DBDRIVER_OBJS =
Tomas Hozza 4fa997
-DBDRIVER_SRCS =
Tomas Hozza 4fa997
+DBDRIVER_OBJS =	ldapdb.@O@ pgsqldb.@O@ sqlitedb.@O@ dirdb.@O@
Tomas Hozza 4fa997
+DBDRIVER_SRCS =	ldapdb.c pgsqldb.c sqlitedb.c dirdb.c
Tomas Hozza 4fa997
 DBDRIVER_INCLUDES =
Tomas Hozza 4fa997
-DBDRIVER_LIBS =
Tomas Hozza 4fa997
+DBDRIVER_LIBS =	-lldap -llber -lsqlite3 -lpq
Adam Tkac f12e46
 
Tomas Hozza 4fa997
 DLZ_DRIVER_DIR =	${top_srcdir}/contrib/dlz/drivers
Adam Tkac f12e46
 
Tomas Hozza 4fa997
@@ -83,7 +83,7 @@ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
Adam Tkac e99cc3
 
Adam Tkac f12e46
 SUBDIRS =	unix
Adam Tkac f12e46
 
Tomas Hozza 4fa997
-TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
Tomas Hozza 4fa997
+TARGETS =	named-sdb@EXEEXT@
Adam Tkac f12e46
 
Tomas Hozza 4fa997
 GEOIPLINKOBJS = geoip.@O@
Adam Tkac f12e46
 
Tomas Hozza 4fa997
@@ -144,7 +144,7 @@ config.@O@: config.c
Tomas Hozza 4fa997
 		-DNS_SYSCONFDIR=\"${sysconfdir}\" \
Tomas Hozza 4fa997
 		-c ${srcdir}/config.c
Adam Tkac f12e46
 
Tomas Hozza 4fa997
-named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
Tomas Hozza 4fa997
+named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
Tomas Hozza 4fa997
 	export MAKE_SYMTABLE="yes"; \
Tomas Hozza 4fa997
 	export BASEOBJS="${OBJS} ${UOBJS}"; \
Tomas Hozza 4fa997
 	${FINALBUILDCMD}
Tomas Hozza 4fa997
@@ -171,15 +171,9 @@ statschannel.@O@: bind9.xsl.h
Adam Tkac c9b941
 
Tomas Hozza 4fa997
 installdirs:
Tomas Hozza 4fa997
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
Tomas Hozza 4fa997
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
Tomas Hozza 4fa997
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
Adam Tkac c9b941
-
Tomas Hozza 4fa997
-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
Tomas Hozza 4fa997
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
Tomas Hozza 4fa997
-	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
Tomas Hozza 4fa997
-	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
Tomas Hozza 4fa997
-	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
Tomas Hozza 4fa997
-	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
Tomas Hozza 4fa997
+
Tomas Hozza 4fa997
+install:: named-sdb@EXEEXT@ installdirs
Tomas Hozza 4fa997
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
 @DLZ_DRIVER_RULES@
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
Tomas Hozza 4fa997
index 8f7c7ee..d603506 100644
Tomas Hozza 4fa997
--- a/bin/named-sdb/main.c
Tomas Hozza 4fa997
+++ b/bin/named-sdb/main.c
Tomas Hozza 4fa997
@@ -86,6 +86,10 @@
Adam Tkac 15c5cd
  * Include header files for database drivers here.
Adam Tkac 15c5cd
  */
Adam Tkac 15c5cd
 /* #include "xxdb.h" */
Adam Tkac 15c5cd
+#include "ldapdb.h"
Adam Tkac 15c5cd
+#include "pgsqldb.h"
Tomas Hozza 4fa997
+#include "sqlitedb.h"
Adam Tkac 15c5cd
+#include "dirdb.h"
Adam Tkac 15c5cd
 
Adam Tkac 86c080
 #ifdef CONTRIB_DLZ
Adam Tkac 15c5cd
 /*
Tomas Hozza 4fa997
@@ -926,6 +930,11 @@ setup(void) {
Adam Tkac 15c5cd
 		ns_main_earlyfatal("isc_app_start() failed: %s",
Adam Tkac 15c5cd
 				   isc_result_totext(result));
Adam Tkac 15c5cd
 
Adam Tkac 15c5cd
+	ldapdb_clear();
Adam Tkac 15c5cd
+	pgsqldb_clear();
Adam Tkac 15c5cd
+	dirdb_clear();
Tomas Hozza 4fa997
+	sqlitedb_clear();
Adam Tkac 15c5cd
+
Adam Tkac 15c5cd
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac c9b941
 		      ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product,
Adam Tkac c9b941
 		      ns_g_version, saved_command_line);
Tomas Hozza 4fa997
@@ -1038,6 +1047,75 @@ setup(void) {
Adam Tkac 15c5cd
 				   isc_result_totext(result));
Adam Tkac 15c5cd
 #endif
Adam Tkac 15c5cd
 
Adam Tkac 15c5cd
+        result = ldapdb_init();
Adam Tkac 15c5cd
+        if (result != ISC_R_SUCCESS)
Adam Tkac 15c5cd
+        {
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_ERROR, 
Adam Tkac 15c5cd
+                          "SDB ldap module initialisation failed: %s.",
Adam Tkac 15c5cd
+                          isc_result_totext(result)
Adam Tkac 15c5cd
+                );
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_ERROR, 
Adam Tkac 15c5cd
+                          "SDB ldap zone database will be unavailable."
Adam Tkac 15c5cd
+                );
Adam Tkac 15c5cd
+        }else
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_NOTICE, "SDB ldap zone database module loaded."
Adam Tkac 15c5cd
+                         );
Adam Tkac 15c5cd
+
Adam Tkac 15c5cd
+        result = pgsqldb_init();
Adam Tkac 15c5cd
+        if (result != ISC_R_SUCCESS)
Adam Tkac 15c5cd
+        {
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_ERROR, 
Adam Tkac 15c5cd
+                          "SDB pgsql module initialisation failed: %s.",
Adam Tkac 15c5cd
+                          isc_result_totext(result)
Adam Tkac 15c5cd
+                );
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_ERROR, 
Adam Tkac 15c5cd
+                          "SDB pgsql zone database will be unavailable."
Adam Tkac 15c5cd
+                );
Adam Tkac 15c5cd
+        }else
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
Adam Tkac 15c5cd
+                         );
Adam Tkac 15c5cd
+
Tomas Hozza 4fa997
+        result = sqlitedb_init();
Tomas Hozza 4fa997
+        if (result != ISC_R_SUCCESS)
Tomas Hozza 4fa997
+        {
Tomas Hozza 4fa997
+             isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Tomas Hozza 4fa997
+                          ISC_LOG_ERROR, 
Tomas Hozza 4fa997
+                          "SDB sqlite3 module initialisation failed: %s.",
Tomas Hozza 4fa997
+                          isc_result_totext(result)
Tomas Hozza 4fa997
+                );
Tomas Hozza 4fa997
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Tomas Hozza 4fa997
+                          ISC_LOG_ERROR, 
Tomas Hozza 4fa997
+                          "SDB sqlite3 zone database will be unavailable."
Tomas Hozza 4fa997
+                );
Tomas Hozza 4fa997
+        }else
Tomas Hozza 4fa997
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Tomas Hozza 4fa997
+                          ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded."
Tomas Hozza 4fa997
+                         );
Tomas Hozza 4fa997
+
Adam Tkac 15c5cd
+        result = dirdb_init();
Adam Tkac 15c5cd
+        if (result != ISC_R_SUCCESS)
Adam Tkac 15c5cd
+        {
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_ERROR, 
Adam Tkac 15c5cd
+                          "SDB directory DB module initialisation failed: %s.",
Adam Tkac 15c5cd
+                          isc_result_totext(result)
Adam Tkac 15c5cd
+                );
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_ERROR, 
Adam Tkac 15c5cd
+                          "SDB directory DB zone database will be unavailable."
Adam Tkac 15c5cd
+                );
Adam Tkac 15c5cd
+        }else
Adam Tkac 15c5cd
+            isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
+                          ISC_LOG_NOTICE, "SDB directory DB zone database module loaded."
Adam Tkac 15c5cd
+                         );
Adam Tkac 15c5cd
+
Tomas Hozza 4fa997
+
Adam Tkac 15c5cd
 	ns_server_create(ns_g_mctx, &ns_g_server);
Adam Tkac 15c5cd
 
Tomas Hozza 4fa997
 #ifdef HAVE_LIBSECCOMP
Tomas Hozza 4fa997
@@ -1073,6 +1151,11 @@ cleanup(void) {
Adam Tkac 15c5cd
 
Adam Tkac 15c5cd
 	dns_name_destroy();
Adam Tkac 15c5cd
 
Tomas Hozza 4fa997
+	ldapdb_clear();
Tomas Hozza 4fa997
+	pgsqldb_clear();
Tomas Hozza 4fa997
+	sqlitedb_clear();
Tomas Hozza 4fa997
+	dirdb_clear();
Adam Tkac 15c5cd
+
Adam Tkac 15c5cd
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
Adam Tkac 15c5cd
 		      ISC_LOG_NOTICE, "exiting");
Adam Tkac 15c5cd
 	ns_log_shutdown();
Tomas Hozza 4fa997
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
Tomas Hozza 4fa997
index ba5ec3c..2c88f46 100644
Tomas Hozza 4fa997
--- a/bin/named/Makefile.in
Tomas Hozza 4fa997
+++ b/bin/named/Makefile.in
Tomas Hozza 4fa997
@@ -49,9 +49,9 @@ DLZDRIVER_LIBS =	@DLZ_DRIVER_LIBS@
Tomas Hozza 4fa997
 CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
Tomas Hozza 4fa997
 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
Tomas Hozza 4fa997
 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
Tomas Hozza 4fa997
-		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
Tomas Hozza 4fa997
+		@DST_OPENSSL_INC@
Adam Tkac 300cfc
 
Tomas Hozza 4fa997
-CDEFINES =      @CONTRIB_DLZ@ @CRYPTO@
Tomas Hozza 4fa997
+CDEFINES =      @CRYPTO@
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
 CWARNINGS =
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
@@ -75,11 +75,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
Tomas Hozza 4fa997
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
Tomas Hozza 4fa997
-		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
Tomas Hozza 4fa997
+		@LIBS@
Adam Tkac 300cfc
 
Tomas Hozza 4fa997
 NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
Tomas Hozza 4fa997
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
Tomas Hozza 4fa997
-		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
Tomas Hozza 4fa997
+		@LIBS@
Adam Tkac 300cfc
 
Adam Tkac 300cfc
 SUBDIRS =	unix
Adam Tkac 300cfc
 
Tomas Hozza 4fa997
@@ -94,8 +94,7 @@ OBJS =		builtin.@O@ client.@O@ config.@O@ control.@O@ \
Tomas Hozza 4fa997
 		tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
Tomas Hozza 4fa997
 		zoneconf.@O@ \
Tomas Hozza 4fa997
 		lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
Tomas Hozza 4fa997
-		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@ \
Tomas Hozza 4fa997
-		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
Tomas Hozza 4fa997
+		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
Adam Tkac 300cfc
 
Tomas Hozza 4fa997
 UOBJS =		unix/os.@O@ unix/dlz_dlopen_driver.@O@
Adam Tkac 300cfc
 
Tomas Hozza 4fa997
@@ -110,8 +109,7 @@ SRCS =		builtin.c client.c config.c control.c \
Tomas Hozza 4fa997
 		tkeyconf.c tsigconf.c update.c xfrout.c \
Tomas Hozza 4fa997
 		zoneconf.c \
Tomas Hozza 4fa997
 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
Tomas Hozza 4fa997
-		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
Tomas Hozza 4fa997
-		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
Tomas Hozza 4fa997
+		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
Adam Tkac 300cfc
 
Tomas Hozza 4fa997
 MANPAGES =	named.8 lwresd.8 named.conf.5
Adam Tkac 300cfc
 
Tomas Hozza 4fa997
@@ -181,7 +179,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
Tomas Hozza 4fa997
 	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
Tomas Hozza 4fa997
 	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
Adam Tkac 300cfc
 
Tomas Hozza 4fa997
-@DLZ_DRIVER_RULES@
Tomas Hozza 4fa997
-
Tomas Hozza 4fa997
 named-symtbl.@O@: named-symtbl.c
Tomas Hozza 4fa997
 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
Tomas Hozza 4fa997
diff --git a/bin/sdb_tools/Makefile.in b/bin/sdb_tools/Makefile.in
Tomas Hozza 4fa997
index 7f3c5e2..b1bca66 100644
Tomas Hozza 4fa997
--- a/bin/sdb_tools/Makefile.in
Tomas Hozza 4fa997
+++ b/bin/sdb_tools/Makefile.in
Tomas Hozza 4fa997
@@ -32,11 +32,11 @@ DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
Tomas Hozza 4fa997
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
Tomas Hozza 4fa997
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
-TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@
Tomas Hozza 4fa997
+TARGETS =	zone2ldap@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
-OBJS	=	zone2ldap.@O@ zonetodb.@O@
Tomas Hozza 4fa997
+OBJS	=	zone2ldap.@O@ zonetodb.@O@ zone2sqlite.@O@
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
-SRCS    =       zone2ldap.c zonetodb.c
Tomas Hozza 4fa997
+SRCS    =       zone2ldap.c zonetodb.c zone2sqlite.c
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
 MANPAGES =      zone2ldap.1
Adam Tkac c9b941
 
Tomas Hozza 4fa997
@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLIBS}
Tomas Hozza 4fa997
 zonetodb@EXEEXT@: zonetodb.@O@  ${DEPLIBS}
Tomas Hozza 4fa997
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
+zone2sqlite@EXEEXT@: zone2sqlite.@O@  ${DEPLIBS}
Tomas Hozza 4fa997
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS}
Tomas Hozza 4fa997
+
Tomas Hozza 4fa997
 clean distclean manclean maintainer-clean::
Tomas Hozza 4fa997
 	rm -f ${TARGETS} ${OBJS}
Tomas Hozza 4fa997
 
Tomas Hozza 4fa997
@@ -60,4 +63,5 @@ installdirs:
Tomas Hozza 4fa997
 install:: ${TARGETS} installdirs
Tomas Hozza 4fa997
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
Tomas Hozza 4fa997
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@  ${DESTDIR}${sbindir}
Tomas Hozza 4fa997
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
Tomas Hozza 4fa997
 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
Tomas Hozza 4fa997
diff --git a/configure.in b/configure.in
Tomas Hozza 4fa997
index 8f3b8f4..b50aa00 100644
Tomas Hozza 4fa997
--- a/configure.in
Tomas Hozza 4fa997
+++ b/configure.in
Tomas Hozza 4fa997
@@ -4477,12 +4477,15 @@ AC_CONFIG_FILES([
Tomas Hozza 4fa997
 	bin/named/unix/Makefile
Tomas Hozza dce2d1
 	bin/named-pkcs11/Makefile
Tomas Hozza dce2d1
 	bin/named-pkcs11/unix/Makefile
Adam Tkac f12e46
+	bin/named-sdb/Makefile
Adam Tkac f12e46
+	bin/named-sdb/unix/Makefile
Adam Tkac f12e46
 	bin/nsupdate/Makefile
Adam Tkac 2fc1c6
 	bin/pkcs11/Makefile
Adam Tkac d6323c
 	bin/python/Makefile
Adam Tkac d6323c
 	bin/python/dnssec-checkds.py
Adam Tkac c9b941
 	bin/python/dnssec-coverage.py
Adam Tkac 5bc2b4
 	bin/rndc/Makefile
Adam Tkac 5bc2b4
+	bin/sdb_tools/Makefile
Adam Tkac 5bc2b4
 	bin/tests/Makefile
Adam Tkac 5bc2b4
 	bin/tests/atomic/Makefile
Adam Tkac 5bc2b4
 	bin/tests/db/Makefile
Tomas Hozza 4fa997
-- 
Tomas Hozza 4fa997
1.9.3
Tomas Hozza 4fa997