You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
240 lines
8.1 KiB
240 lines
8.1 KiB
6 years ago
|
diff --git a/bin/Makefile.in b/bin/Makefile.in
|
||
|
|
index 187ec23..e6179e7 100644
|
||
|
|
--- a/bin/Makefile.in
|
||
|
|
+++ b/bin/Makefile.in
|
||
|
|
@@ -19,8 +19,8 @@ srcdir = @srcdir@
|
||
|
|
VPATH = @srcdir@
|
||
|
|
top_srcdir = @top_srcdir@
|
||
|
|
|
||
|
|
-SUBDIRS = named named-pkcs11 rndc dig dnssec dnssec-pkcs11 tools tests nsupdate \
|
||
|
|
- check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
|
||
|
|
+SUBDIRS = named named-pkcs11 named-sdb rndc dig dnssec dnssec-pkcs11 tools tests nsupdate \
|
||
|
|
+ check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools
|
||
|
|
TARGETS =
|
||
|
|
|
||
|
|
@BIND9_MAKE_RULES@
|
||
|
|
diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
|
||
|
|
index bc5be2a..71324d9 100644
|
||
|
|
--- a/bin/named-sdb/Makefile.in
|
||
|
|
+++ b/bin/named-sdb/Makefile.in
|
||
|
|
@@ -34,10 +34,10 @@ top_srcdir = @top_srcdir@
|
||
|
|
#
|
||
|
|
# Add database drivers here.
|
||
|
|
#
|
||
|
|
-DBDRIVER_OBJS =
|
||
|
|
-DBDRIVER_SRCS =
|
||
|
|
+DBDRIVER_OBJS = ldapdb.@O@ pgsqldb.@O@ dirdb.@O@
|
||
|
|
+DBDRIVER_SRCS = ldapdb.c pgsqldb.c dirdb.c
|
||
|
|
DBDRIVER_INCLUDES =
|
||
|
|
-DBDRIVER_LIBS =
|
||
|
|
+DBDRIVER_LIBS = -lldap -llber -lpq
|
||
|
|
|
||
|
|
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
|
||
|
|
|
||
|
|
@@ -83,7 +83,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
||
|
|
|
||
|
|
SUBDIRS = unix
|
||
|
|
|
||
|
|
-TARGETS = named@EXEEXT@ lwresd@EXEEXT@
|
||
|
|
+TARGETS = named-sdb@EXEEXT@
|
||
|
|
|
||
|
|
GEOIPLINKOBJS = geoip.@O@
|
||
|
|
|
||
|
|
@@ -146,7 +146,7 @@ config.@O@: config.c bind.keys.h
|
||
|
|
-DNS_SYSCONFDIR=\"${sysconfdir}\" \
|
||
|
|
-c ${srcdir}/config.c
|
||
|
|
|
||
|
|
-named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
|
||
|
|
+named-sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
|
||
|
|
export MAKE_SYMTABLE="yes"; \
|
||
|
|
export BASEOBJS="${OBJS} ${UOBJS}"; \
|
||
|
|
${FINALBUILDCMD}
|
||
|
|
@@ -177,15 +177,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3.xsl.h
|
||
|
|
|
||
|
|
installdirs:
|
||
|
|
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
|
||
|
|
- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
|
||
|
|
- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
|
||
|
|
-
|
||
|
|
-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
|
||
|
|
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
|
||
|
|
- (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
|
||
|
|
- ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
|
||
|
|
- ${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
|
||
|
|
- ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
|
||
|
|
+
|
||
|
|
+install:: named-sdb@EXEEXT@ installdirs
|
||
|
|
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
|
||
|
|
|
||
|
|
@DLZ_DRIVER_RULES@
|
||
|
|
|
||
|
|
diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
|
||
|
|
index a00687f..4fba625 100644
|
||
|
|
--- a/bin/named-sdb/main.c
|
||
|
|
+++ b/bin/named-sdb/main.c
|
||
|
|
@@ -86,6 +86,9 @@
|
||
|
|
* Include header files for database drivers here.
|
||
|
|
*/
|
||
|
|
/* #include "xxdb.h" */
|
||
|
|
+#include "ldapdb.h"
|
||
|
|
+#include "pgsqldb.h"
|
||
|
|
+#include "dirdb.h"
|
||
|
|
|
||
|
|
#ifdef CONTRIB_DLZ
|
||
|
|
/*
|
||
|
|
@@ -817,6 +820,10 @@ setup(void) {
|
||
|
|
ns_main_earlyfatal("isc_app_start() failed: %s",
|
||
|
|
isc_result_totext(result));
|
||
|
|
|
||
|
|
+ ldapdb_clear();
|
||
|
|
+ pgsqldb_clear();
|
||
|
|
+ dirdb_clear();
|
||
|
|
+
|
||
|
|
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
||
|
|
ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product,
|
||
|
|
ns_g_version, saved_command_line);
|
||
|
|
@@ -929,6 +936,57 @@ setup(void) {
|
||
|
|
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 = 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);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -960,6 +1018,10 @@ cleanup(void) {
|
||
|
|
|
||
|
|
dns_name_destroy();
|
||
|
|
|
||
|
|
+ ldapdb_clear();
|
||
|
|
+ pgsqldb_clear();
|
||
|
|
+ dirdb_clear();
|
||
|
|
+
|
||
|
|
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
||
|
|
ISC_LOG_NOTICE, "exiting");
|
||
|
|
ns_log_shutdown();
|
||
|
|
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
|
||
|
|
index bc5be2a..3c69c9b 100644
|
||
|
|
--- a/bin/named/Makefile.in
|
||
|
|
+++ b/bin/named/Makefile.in
|
||
|
|
@@ -51,7 +51,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
|
||
|
|
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
|
||
|
|
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
|
||
|
|
|
||
|
|
-CDEFINES = @CONTRIB_DLZ@ @CRYPTO@
|
||
|
|
+CDEFINES = @CRYPTO@
|
||
|
|
|
||
|
|
CWARNINGS =
|
||
|
|
|
||
|
|
@@ -75,11 +75,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
|
||
|
|
|
||
|
|
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
|
||
|
|
|
||
|
|
@@ -94,8 +94,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \
|
||
|
|
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@
|
||
|
|
|
||
|
|
@@ -110,8 +109,7 @@ SRCS = builtin.c client.c config.c control.c \
|
||
|
|
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
|
||
|
|
|
||
|
|
@@ -187,7 +185,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
|
||
|
|
${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
|
||
|
|
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
|
||
|
|
|
||
|
|
-@DLZ_DRIVER_RULES@
|
||
|
|
-
|
||
|
|
named-symtbl.@O@: named-symtbl.c
|
||
|
|
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
|
||
|
|
diff --git a/configure.in b/configure.in
|
||
|
|
index 9bb9a2a..d72093f 100644
|
||
|
|
--- a/configure.in
|
||
|
|
+++ b/configure.in
|
||
|
|
@@ -4018,12 +4018,15 @@ AC_CONFIG_FILES([
|
||
|
|
bin/named-pkcs11/Makefile
|
||
|
|
bin/named-pkcs11/unix/Makefile
|
||
|
|
bin/named/unix/Makefile
|
||
|
|
+ bin/named-sdb/Makefile
|
||
|
|
+ bin/named-sdb/unix/Makefile
|
||
|
|
bin/nsupdate/Makefile
|
||
|
|
bin/pkcs11/Makefile
|
||
|
|
bin/python/Makefile
|
||
|
|
bin/python/dnssec-checkds.py
|
||
|
|
bin/python/dnssec-coverage.py
|
||
|
|
bin/rndc/Makefile
|
||
|
|
+ bin/sdb_tools/Makefile
|
||
|
|
bin/tests/Makefile
|
||
|
|
bin/tests/atomic/Makefile
|
||
|
|
bin/tests/db/Makefile
|