| 1 |
diff -Naurp bind-9.9.5/bin/named-sdb/main.c bind-9.9.5.oden/bin/named-sdb/main.c |
| 2 |
--- bind-9.9.5/bin/named-sdb/main.c 2014-02-02 14:45:09.550400485 +0100 |
| 3 |
+++ bind-9.9.5.oden/bin/named-sdb/main.c 2014-02-02 14:45:34.203401863 +0100 |
| 4 |
@@ -85,6 +85,7 @@ |
| 5 |
/* #include "xxdb.h" */ |
| 6 |
#include "ldapdb.h" |
| 7 |
#include "pgsqldb.h" |
| 8 |
+#include "sqlitedb.h" |
| 9 |
#include "dirdb.h" |
| 10 |
|
| 11 |
#ifdef CONTRIB_DLZ |
| 12 |
@@ -837,6 +838,7 @@ setup(void) { |
| 13 |
|
| 14 |
ldapdb_clear(); |
| 15 |
pgsqldb_clear(); |
| 16 |
+ sqlitedb_clear(); |
| 17 |
dirdb_clear(); |
| 18 |
|
| 19 |
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
| 20 |
@@ -985,6 +987,23 @@ setup(void) { |
| 21 |
ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded." |
| 22 |
); |
| 23 |
|
| 24 |
+ result = sqlitedb_init(); |
| 25 |
+ if (result != ISC_R_SUCCESS) |
| 26 |
+ { |
| 27 |
+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
| 28 |
+ ISC_LOG_ERROR, |
| 29 |
+ "SDB sqlite3 module initialisation failed: %s.", |
| 30 |
+ isc_result_totext(result) |
| 31 |
+ ); |
| 32 |
+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
| 33 |
+ ISC_LOG_ERROR, |
| 34 |
+ "SDB sqlite3 zone database will be unavailable." |
| 35 |
+ ); |
| 36 |
+ }else |
| 37 |
+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
| 38 |
+ ISC_LOG_NOTICE, "SDB sqlite3 DB zone database module loaded." |
| 39 |
+ ); |
| 40 |
+ |
| 41 |
result = dirdb_init(); |
| 42 |
if (result != ISC_R_SUCCESS) |
| 43 |
{ |
| 44 |
@@ -1035,6 +1054,7 @@ cleanup(void) { |
| 45 |
|
| 46 |
ldapdb_clear(); |
| 47 |
pgsqldb_clear(); |
| 48 |
+ sqlitedb_clear(); |
| 49 |
dirdb_clear(); |
| 50 |
|
| 51 |
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
| 52 |
diff -Naurp bind-9.9.5/bin/named-sdb/Makefile.in bind-9.9.5.oden/bin/named-sdb/Makefile.in |
| 53 |
--- bind-9.9.5/bin/named-sdb/Makefile.in 2014-02-02 14:45:09.551400485 +0100 |
| 54 |
+++ bind-9.9.5.oden/bin/named-sdb/Makefile.in 2014-02-02 14:45:34.204401864 +0100 |
| 55 |
@@ -34,10 +34,10 @@ top_srcdir = @top_srcdir@ |
| 56 |
# |
| 57 |
# Add database drivers here. |
| 58 |
# |
| 59 |
-DBDRIVER_OBJS = ldapdb.@O@ pgsqldb.@O@ dirdb.@O@ |
| 60 |
-DBDRIVER_SRCS = ldapdb.c pgsqldb.c dirdb.c |
| 61 |
+DBDRIVER_OBJS = ldapdb.@O@ pgsqldb.@O@ sqlitedb.@O@ dirdb.@O@ |
| 62 |
+DBDRIVER_SRCS = ldapdb.c pgsqldb.c sqlitedb.c dirdb.c |
| 63 |
DBDRIVER_INCLUDES = |
| 64 |
-DBDRIVER_LIBS = -lldap -llber -lpq |
| 65 |
+DBDRIVER_LIBS = -lldap -llber -lpq -lsqlite3 |
| 66 |
|
| 67 |
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers |
| 68 |
|
| 69 |
diff -Naurp bind-9.9.5/bin/sdb_tools/Makefile.in bind-9.9.5.oden/bin/sdb_tools/Makefile.in |
| 70 |
--- bind-9.9.5/bin/sdb_tools/Makefile.in 2014-02-02 14:45:09.553400485 +0100 |
| 71 |
+++ bind-9.9.5.oden/bin/sdb_tools/Makefile.in 2014-02-02 14:45:34.204401864 +0100 |
| 72 |
@@ -32,11 +32,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} |
| 73 |
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ |
| 74 |
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@ |
| 75 |
|
| 76 |
-TARGETS = zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@ |
| 77 |
+TARGETS = zone2ldap@EXEEXT@ ldap2zone@EXEEXT@ zonetodb@EXEEXT@ zone2sqlite@EXEEXT@ |
| 78 |
|
| 79 |
-OBJS = zone2ldap.@O@ ldap2zone.@O@ zonetodb.@O@ |
| 80 |
+OBJS = zone2ldap.@O@ ldap2zone.@O@ zonetodb.@O@ zone2sqlite.@O@ |
| 81 |
|
| 82 |
-SRCS = zone2ldap.c ldap2zone.c zonetodb.c |
| 83 |
+SRCS = zone2ldap.c ldap2zone.c zonetodb.c zone2sqlite.c |
| 84 |
|
| 85 |
MANPAGES = zone2ldap.1 |
| 86 |
|
| 87 |
@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLI |
| 88 |
zonetodb@EXEEXT@: zonetodb.@O@ ${DEPLIBS} |
| 89 |
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS} |
| 90 |
|
| 91 |
+zone2sqlite@EXEEXT@: zone2sqlite.@O@ ${DEPLIBS} |
| 92 |
+ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.@O@ -lsqlite3 -lssl ${LIBS} |
| 93 |
+ |
| 94 |
ldap2zone@EXEEXT@: ldap2zone.@O@ ${DEPLIBS} |
| 95 |
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone.@O@ -lldap -llber ${LIBS} |
| 96 |
|
| 97 |
@@ -64,4 +67,5 @@ install:: ${TARGETS} installdirs |
| 98 |
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir} |
| 99 |
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone@EXEEXT@ ${DESTDIR}${sbindir} |
| 100 |
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@ ${DESTDIR}${sbindir} |
| 101 |
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir} |
| 102 |
${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1 |
Parent Directory
| 
Revision Log