1 |
diff -up bind-9.9.3rc1/bin/Makefile.in.sdb bind-9.9.3rc1/bin/Makefile.in |
diff -Naurp bind-9.9.5/bin/Makefile.in bind-9.9.5.oden/bin/Makefile.in |
2 |
--- bind-9.9.3rc1/bin/Makefile.in.sdb 2013-04-05 00:21:21.000000000 +0200 |
--- bind-9.9.5/bin/Makefile.in 2014-01-27 19:58:24.000000000 +0100 |
3 |
+++ bind-9.9.3rc1/bin/Makefile.in 2013-04-16 15:21:22.286944331 +0200 |
+++ bind-9.9.5.oden/bin/Makefile.in 2014-02-02 14:19:52.561315661 +0100 |
4 |
@@ -19,8 +19,8 @@ srcdir = @srcdir@ |
@@ -19,8 +19,8 @@ srcdir = @srcdir@ |
5 |
VPATH = @srcdir@ |
VPATH = @srcdir@ |
6 |
top_srcdir = @top_srcdir@ |
top_srcdir = @top_srcdir@ |
12 |
TARGETS = |
TARGETS = |
13 |
|
|
14 |
@BIND9_MAKE_RULES@ |
@BIND9_MAKE_RULES@ |
15 |
diff -up bind-9.9.3rc1/bin/named/Makefile.in.sdb bind-9.9.3rc1/bin/named/Makefile.in |
diff -Naurp bind-9.9.5/bin/named/Makefile.in bind-9.9.5.oden/bin/named/Makefile.in |
16 |
--- bind-9.9.3rc1/bin/named/Makefile.in.sdb 2013-04-16 15:21:22.102944727 +0200 |
--- bind-9.9.5/bin/named/Makefile.in 2014-02-02 14:19:42.718315110 +0100 |
17 |
+++ bind-9.9.3rc1/bin/named/Makefile.in 2013-04-16 15:21:22.286944331 +0200 |
+++ bind-9.9.5.oden/bin/named/Makefile.in 2014-02-02 14:19:52.561315661 +0100 |
18 |
@@ -49,7 +49,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd |
@@ -51,7 +51,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd |
19 |
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ |
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ |
20 |
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@ |
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@ |
21 |
|
|
24 |
|
|
25 |
CWARNINGS = |
CWARNINGS = |
26 |
|
|
27 |
@@ -73,11 +73,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} |
@@ -75,11 +75,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} |
28 |
|
|
29 |
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ |
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ |
30 |
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ |
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ |
38 |
|
|
39 |
SUBDIRS = unix |
SUBDIRS = unix |
40 |
|
|
41 |
@@ -90,8 +90,7 @@ OBJS = builtin.@O@ client.@O@ config.@O |
@@ -92,8 +92,7 @@ OBJS = builtin.@O@ client.@O@ config.@O |
42 |
tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ |
tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ |
43 |
zoneconf.@O@ \ |
zoneconf.@O@ \ |
44 |
lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \ |
lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \ |
48 |
|
|
49 |
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@ |
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@ |
50 |
|
|
51 |
@@ -104,8 +103,7 @@ SRCS = builtin.c client.c config.c cont |
@@ -106,8 +105,7 @@ SRCS = builtin.c client.c config.c cont |
52 |
tkeyconf.c tsigconf.c update.c xfrout.c \ |
tkeyconf.c tsigconf.c update.c xfrout.c \ |
53 |
zoneconf.c \ |
zoneconf.c \ |
54 |
lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ |
lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ |
58 |
|
|
59 |
MANPAGES = named.8 lwresd.8 named.conf.5 |
MANPAGES = named.8 lwresd.8 named.conf.5 |
60 |
|
|
61 |
@@ -180,7 +178,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i |
@@ -184,7 +182,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i |
62 |
${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8 |
${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8 |
63 |
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 |
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 |
64 |
|
|
66 |
- |
- |
67 |
named-symtbl.@O@: named-symtbl.c |
named-symtbl.@O@: named-symtbl.c |
68 |
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c |
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c |
69 |
diff -up bind-9.9.3rc1/bin/named-sdb/main.c.sdb bind-9.9.3rc1/bin/named-sdb/main.c |
diff -Naurp bind-9.9.5/bin/named-sdb/main.c bind-9.9.5.oden/bin/named-sdb/main.c |
70 |
--- bind-9.9.3rc1/bin/named-sdb/main.c.sdb 2013-04-16 15:21:22.249944411 +0200 |
--- bind-9.9.5/bin/named-sdb/main.c 2014-02-02 14:19:42.769315113 +0100 |
71 |
+++ bind-9.9.3rc1/bin/named-sdb/main.c 2013-04-16 15:21:22.287944329 +0200 |
+++ bind-9.9.5.oden/bin/named-sdb/main.c 2014-02-02 14:19:52.562315661 +0100 |
72 |
@@ -83,6 +83,9 @@ |
@@ -83,6 +83,9 @@ |
73 |
* Include header files for database drivers here. |
* Include header files for database drivers here. |
74 |
*/ |
*/ |
79 |
|
|
80 |
#ifdef CONTRIB_DLZ |
#ifdef CONTRIB_DLZ |
81 |
/* |
/* |
82 |
@@ -808,6 +811,10 @@ setup(void) { |
@@ -832,6 +835,10 @@ setup(void) { |
83 |
ns_main_earlyfatal("isc_app_start() failed: %s", |
ns_main_earlyfatal("isc_app_start() failed: %s", |
84 |
isc_result_totext(result)); |
isc_result_totext(result)); |
85 |
|
|
90 |
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
91 |
ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product, |
ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product, |
92 |
ns_g_version, saved_command_line); |
ns_g_version, saved_command_line); |
93 |
@@ -920,6 +927,57 @@ setup(void) { |
@@ -944,6 +951,57 @@ setup(void) { |
94 |
isc_result_totext(result)); |
isc_result_totext(result)); |
95 |
#endif |
#endif |
96 |
|
|
148 |
ns_server_create(ns_g_mctx, &ns_g_server); |
ns_server_create(ns_g_mctx, &ns_g_server); |
149 |
} |
} |
150 |
|
|
151 |
@@ -951,6 +1009,10 @@ cleanup(void) { |
@@ -975,6 +1033,10 @@ cleanup(void) { |
152 |
|
|
153 |
dns_name_destroy(); |
dns_name_destroy(); |
154 |
|
|
159 |
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, |
160 |
ISC_LOG_NOTICE, "exiting"); |
ISC_LOG_NOTICE, "exiting"); |
161 |
ns_log_shutdown(); |
ns_log_shutdown(); |
162 |
diff -up bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb bind-9.9.3rc1/bin/named-sdb/Makefile.in |
diff -Naurp bind-9.9.5/bin/named-sdb/Makefile.in bind-9.9.5.oden/bin/named-sdb/Makefile.in |
163 |
--- bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb 2013-04-16 15:21:22.243944424 +0200 |
--- bind-9.9.5/bin/named-sdb/Makefile.in 2014-02-02 14:19:42.769315113 +0100 |
164 |
+++ bind-9.9.3rc1/bin/named-sdb/Makefile.in 2013-04-16 15:21:22.287944329 +0200 |
+++ bind-9.9.5.oden/bin/named-sdb/Makefile.in 2014-02-02 14:19:52.562315661 +0100 |
165 |
@@ -32,10 +32,10 @@ top_srcdir = @top_srcdir@ |
@@ -34,10 +34,10 @@ top_srcdir = @top_srcdir@ |
166 |
# |
# |
167 |
# Add database drivers here. |
# Add database drivers here. |
168 |
# |
# |
176 |
|
|
177 |
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers |
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers |
178 |
|
|
179 |
@@ -81,7 +81,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BI |
@@ -83,7 +83,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BI |
180 |
|
|
181 |
SUBDIRS = unix |
SUBDIRS = unix |
182 |
|
|
185 |
|
|
186 |
OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \ |
OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \ |
187 |
controlconf.@O@ interfacemgr.@O@ \ |
controlconf.@O@ interfacemgr.@O@ \ |
188 |
@@ -139,7 +139,7 @@ config.@O@: config.c bind.keys.h |
@@ -143,7 +143,7 @@ config.@O@: config.c bind.keys.h |
189 |
-DNS_SYSCONFDIR=\"${sysconfdir}\" \ |
-DNS_SYSCONFDIR=\"${sysconfdir}\" \ |
190 |
-c ${srcdir}/config.c |
-c ${srcdir}/config.c |
191 |
|
|
194 |
export MAKE_SYMTABLE="yes"; \ |
export MAKE_SYMTABLE="yes"; \ |
195 |
export BASEOBJS="${OBJS} ${UOBJS}"; \ |
export BASEOBJS="${OBJS} ${UOBJS}"; \ |
196 |
${FINALBUILDCMD} |
${FINALBUILDCMD} |
197 |
@@ -170,15 +170,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3 |
@@ -174,15 +174,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3 |
198 |
|
|
199 |
installdirs: |
installdirs: |
200 |
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} |
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} |
212 |
|
|
213 |
@DLZ_DRIVER_RULES@ |
@DLZ_DRIVER_RULES@ |
214 |
|
|
215 |
diff -up bind-9.9.3rc1/configure.in.sdb bind-9.9.3rc1/configure.in |
diff -Naurp bind-9.9.5/configure.in bind-9.9.5.oden/configure.in |
216 |
--- bind-9.9.3rc1/configure.in.sdb 2013-04-16 15:21:22.208944499 +0200 |
--- bind-9.9.5/configure.in 2014-02-02 14:19:42.763315113 +0100 |
217 |
+++ bind-9.9.3rc1/configure.in 2013-04-16 15:21:19.395950103 +0200 |
+++ bind-9.9.5.oden/configure.in 2014-02-02 14:19:52.563315661 +0100 |
218 |
@@ -3651,12 +3651,15 @@ AC_CONFIG_FILES([ |
@@ -3716,12 +3716,15 @@ AC_CONFIG_FILES([ |
219 |
bin/dnssec/Makefile |
bin/dnssec/Makefile |
220 |
bin/named/Makefile |
bin/named/Makefile |
221 |
bin/named/unix/Makefile |
bin/named/unix/Makefile |