1 |
diff -Naur -x '*~' -x '*.rej' -x '*.orig' bind-9.11.6/bin/Makefile.in bind-9.11.6-sdb/bin/Makefile.in |
2 |
--- bind-9.11.6/bin/Makefile.in 2019-02-28 00:28:15.000000000 +0100 |
3 |
+++ bind-9.11.6-sdb/bin/Makefile.in 2019-04-22 20:37:53.887698700 +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.6/bin/named/Makefile.in bind-9.11.6-sdb/bin/named/Makefile.in |
16 |
--- bind-9.11.6/bin/named/Makefile.in 2019-04-22 20:38:10.458557943 +0200 |
17 |
+++ bind-9.11.6-sdb/bin/named/Makefile.in 2019-04-22 20:23:14.398169165 +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 = @USE_PKCS11@ @PKCS11_ENGINE@ @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.6/bin/named-sdb/main.c bind-9.11.6-sdb/bin/named-sdb/main.c |
73 |
--- bind-9.11.6/bin/named-sdb/main.c 2019-04-22 20:38:10.515557459 +0200 |
74 |
+++ bind-9.11.6-sdb/bin/named-sdb/main.c 2019-04-22 20:17:17.316202256 +0200 |
75 |
@@ -93,6 +93,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 |
@@ -1063,6 +1067,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 |
@@ -1263,6 +1272,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 |
@@ -1305,6 +1383,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.6/bin/named-sdb/Makefile.in bind-9.11.6-sdb/bin/named-sdb/Makefile.in |
187 |
--- bind-9.11.6/bin/named-sdb/Makefile.in 2019-04-22 20:38:10.512557484 +0200 |
188 |
+++ bind-9.11.6-sdb/bin/named-sdb/Makefile.in 2019-04-22 20:24:28.233541997 +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.6/bin/sdb_tools/Makefile.in bind-9.11.6-sdb/bin/sdb_tools/Makefile.in |
251 |
--- bind-9.11.6/bin/sdb_tools/Makefile.in 2019-04-22 20:26:14.288641157 +0200 |
252 |
+++ bind-9.11.6-sdb/bin/sdb_tools/Makefile.in 2019-04-22 20:17:17.316202256 +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.6/configure.ac bind-9.11.6-sdb/configure.ac |
285 |
--- bind-9.11.6/configure.ac 2019-04-22 20:38:10.471557833 +0200 |
286 |
+++ bind-9.11.6-sdb/configure.ac 2019-04-22 20:17:57.075864538 +0200 |
287 |
@@ -5427,6 +5427,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 |
@@ -5451,6 +5453,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 |