Rebase to 9.8.1rc1 and update patches.
bind97-cleanup.patch, bind97-rh674334.patch and bind98-includes.patch were merged. Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
parent
6322cef147
commit
86c080f6b6
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ bind-9.7.2b1.tar.gz
|
||||
/bind-9.8.0-P1.tar.gz
|
||||
/bind-9.8.0-P2.tar.gz
|
||||
/bind-9.8.0-P4.tar.gz
|
||||
/bind-9.8.1rc1.tar.gz
|
||||
|
@ -1,15 +1,15 @@
|
||||
diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named-sdb/main.c
|
||||
--- bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld 2008-07-21 12:19:50.000000000 +0200
|
||||
+++ bind-9.5.1b1/bin/named-sdb/main.c 2008-07-21 12:19:50.000000000 +0200
|
||||
@@ -74,6 +74,7 @@
|
||||
diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.8.1rc1/bin/named-sdb/main.c
|
||||
--- bind-9.8.1rc1/bin/named-sdb/main.c.sdb-sqlite-bld 2011-08-31 14:41:15.646020840 +0200
|
||||
+++ bind-9.8.1rc1/bin/named-sdb/main.c 2011-08-31 14:41:35.132019452 +0200
|
||||
@@ -85,6 +85,7 @@
|
||||
/* #include "xxdb.h" */
|
||||
#include "ldapdb.h"
|
||||
#include "pgsqldb.h"
|
||||
+#include "sqlitedb.h"
|
||||
#include "dirdb.h"
|
||||
|
||||
/*
|
||||
@@ -646,6 +647,7 @@ setup(void) {
|
||||
#ifdef CONTRIB_DLZ
|
||||
@@ -792,6 +793,7 @@ setup(void) {
|
||||
|
||||
ldapdb_clear();
|
||||
pgsqldb_clear();
|
||||
@ -17,7 +17,7 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
|
||||
dirdb_clear();
|
||||
|
||||
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
||||
@@ -743,6 +745,23 @@ setup(void) {
|
||||
@@ -921,6 +923,23 @@ setup(void) {
|
||||
ISC_LOG_NOTICE, "SDB postgreSQL DB zone database module loaded."
|
||||
);
|
||||
|
||||
@ -41,7 +41,7 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
|
||||
result = dirdb_init();
|
||||
if (result != ISC_R_SUCCESS)
|
||||
{
|
||||
@@ -787,6 +806,7 @@ cleanup(void) {
|
||||
@@ -971,6 +990,7 @@ cleanup(void) {
|
||||
|
||||
ldapdb_clear();
|
||||
pgsqldb_clear();
|
||||
@ -49,10 +49,10 @@ diff -up bind-9.5.1b1/bin/named-sdb/main.c.sdb-sqlite-bld bind-9.5.1b1/bin/named
|
||||
dirdb_clear();
|
||||
|
||||
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
||||
diff -up bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/named-sdb/Makefile.in
|
||||
--- bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld 2008-07-21 12:19:50.000000000 +0200
|
||||
+++ bind-9.5.1b1/bin/named-sdb/Makefile.in 2008-07-21 12:19:50.000000000 +0200
|
||||
@@ -26,10 +26,10 @@ top_srcdir = @top_srcdir@
|
||||
diff -up bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.8.1rc1/bin/named-sdb/Makefile.in
|
||||
--- bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb-sqlite-bld 2011-08-31 14:41:15.646020840 +0200
|
||||
+++ bind-9.8.1rc1/bin/named-sdb/Makefile.in 2011-08-31 14:41:15.658020839 +0200
|
||||
@@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@
|
||||
#
|
||||
# Add database drivers here.
|
||||
#
|
||||
@ -66,10 +66,10 @@ diff -up bind-9.5.1b1/bin/named-sdb/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
|
||||
|
||||
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
|
||||
|
||||
diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/sdb_tools/Makefile.in
|
||||
--- bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld 2008-07-21 12:19:50.000000000 +0200
|
||||
+++ bind-9.5.1b1/bin/sdb_tools/Makefile.in 2008-07-21 12:22:13.000000000 +0200
|
||||
@@ -30,11 +30,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
|
||||
diff -up bind-9.8.1rc1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.8.1rc1/bin/sdb_tools/Makefile.in
|
||||
--- bind-9.8.1rc1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld 2011-08-31 14:41:15.651020840 +0200
|
||||
+++ bind-9.8.1rc1/bin/sdb_tools/Makefile.in 2011-08-31 14:41:15.658020839 +0200
|
||||
@@ -32,11 +32,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
|
||||
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
||||
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} ${DBDRIVER_LIBS} @LIBS@
|
||||
|
||||
@ -84,7 +84,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
|
||||
|
||||
MANPAGES = zone2ldap.1
|
||||
|
||||
@@ -48,6 +48,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLI
|
||||
@@ -50,6 +50,9 @@ zone2ldap@EXEEXT@: zone2ldap.@O@ ${DEPLI
|
||||
zonetodb@EXEEXT@: zonetodb.@O@ ${DEPLIBS}
|
||||
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.@O@ -lpq ${LIBS}
|
||||
|
||||
@ -94,7 +94,7 @@ diff -up bind-9.5.1b1/bin/sdb_tools/Makefile.in.sdb-sqlite-bld bind-9.5.1b1/bin/
|
||||
ldap2zone@EXEEXT@: ldap2zone.@O@ ${DEPLIBS}
|
||||
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone.@O@ -lldap -llber ${LIBS}
|
||||
|
||||
@@ -62,4 +65,5 @@ install:: ${TARGETS} installdirs
|
||||
@@ -64,4 +67,5 @@ install:: ${TARGETS} installdirs
|
||||
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap@EXEEXT@ ${DESTDIR}${sbindir}
|
||||
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone@EXEEXT@ ${DESTDIR}${sbindir}
|
||||
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@ ${DESTDIR}${sbindir}
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -up bind-9.8.0rc1/bin/Makefile.in.sdb bind-9.8.0rc1/bin/Makefile.in
|
||||
--- bind-9.8.0rc1/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200
|
||||
+++ bind-9.8.0rc1/bin/Makefile.in 2011-02-21 16:28:51.678648382 +0100
|
||||
diff -up bind-9.8.1rc1/bin/Makefile.in.sdb bind-9.8.1rc1/bin/Makefile.in
|
||||
--- bind-9.8.1rc1/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200
|
||||
+++ bind-9.8.1rc1/bin/Makefile.in 2011-08-31 14:34:24.049049431 +0200
|
||||
@@ -19,8 +19,8 @@ srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@ -12,14 +12,14 @@ diff -up bind-9.8.0rc1/bin/Makefile.in.sdb bind-9.8.0rc1/bin/Makefile.in
|
||||
TARGETS =
|
||||
|
||||
@BIND9_MAKE_RULES@
|
||||
diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefile.in
|
||||
--- bind-9.8.0rc1/bin/named/Makefile.in.sdb 2011-02-21 16:28:51.618648508 +0100
|
||||
+++ bind-9.8.0rc1/bin/named/Makefile.in 2011-02-21 16:29:11.808606048 +0100
|
||||
diff -up bind-9.8.1rc1/bin/named/Makefile.in.sdb bind-9.8.1rc1/bin/named/Makefile.in
|
||||
--- bind-9.8.1rc1/bin/named/Makefile.in.sdb 2011-08-31 14:34:23.927049440 +0200
|
||||
+++ bind-9.8.1rc1/bin/named/Makefile.in 2011-08-31 14:39:33.980027898 +0200
|
||||
@@ -45,7 +45,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd
|
||||
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
|
||||
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
|
||||
|
||||
-CDEFINES = @USE_DLZ@ @USE_PKCS11@ @USE_OPENSSL@
|
||||
-CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @USE_OPENSSL@
|
||||
+CDEFINES = @USE_PKCS11@ @USE_OPENSSL@
|
||||
|
||||
CWARNINGS =
|
||||
@ -46,7 +46,7 @@ diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefil
|
||||
- ${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
|
||||
+ lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
|
||||
|
||||
UOBJS = unix/os.@O@
|
||||
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
|
||||
|
||||
@@ -100,8 +99,7 @@ SRCS = builtin.c client.c config.c cont
|
||||
tkeyconf.c tsigconf.c update.c xfrout.c \
|
||||
@ -64,10 +64,10 @@ diff -up bind-9.8.0rc1/bin/named/Makefile.in.sdb bind-9.8.0rc1/bin/named/Makefil
|
||||
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
|
||||
-
|
||||
-@DLZ_DRIVER_RULES@
|
||||
diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main.c
|
||||
--- bind-9.8.0rc1/bin/named-sdb/main.c.sdb 2011-02-21 16:28:51.638648466 +0100
|
||||
+++ bind-9.8.0rc1/bin/named-sdb/main.c 2011-02-21 16:28:51.678648382 +0100
|
||||
@@ -81,6 +81,9 @@
|
||||
diff -up bind-9.8.1rc1/bin/named-sdb/main.c.sdb bind-9.8.1rc1/bin/named-sdb/main.c
|
||||
--- bind-9.8.1rc1/bin/named-sdb/main.c.sdb 2011-08-31 14:34:23.977049436 +0200
|
||||
+++ bind-9.8.1rc1/bin/named-sdb/main.c 2011-08-31 14:40:09.833025405 +0200
|
||||
@@ -83,6 +83,9 @@
|
||||
* Include header files for database drivers here.
|
||||
*/
|
||||
/* #include "xxdb.h" */
|
||||
@ -75,9 +75,9 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main
|
||||
+#include "pgsqldb.h"
|
||||
+#include "dirdb.h"
|
||||
|
||||
#ifdef CONTRIB_DLZ
|
||||
/*
|
||||
* Include DLZ drivers if appropriate.
|
||||
@@ -784,6 +787,10 @@ setup(void) {
|
||||
@@ -787,6 +790,10 @@ setup(void) {
|
||||
ns_main_earlyfatal("isc_app_start() failed: %s",
|
||||
isc_result_totext(result));
|
||||
|
||||
@ -88,7 +88,7 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main
|
||||
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
||||
ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version,
|
||||
saved_command_line);
|
||||
@@ -867,6 +874,57 @@ setup(void) {
|
||||
@@ -880,6 +887,57 @@ setup(void) {
|
||||
isc_result_totext(result));
|
||||
#endif
|
||||
|
||||
@ -146,7 +146,7 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main
|
||||
ns_server_create(ns_g_mctx, &ns_g_server);
|
||||
}
|
||||
|
||||
@@ -894,6 +952,10 @@ cleanup(void) {
|
||||
@@ -911,6 +969,10 @@ cleanup(void) {
|
||||
|
||||
dns_name_destroy();
|
||||
|
||||
@ -157,9 +157,9 @@ diff -up bind-9.8.0rc1/bin/named-sdb/main.c.sdb bind-9.8.0rc1/bin/named-sdb/main
|
||||
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
||||
ISC_LOG_NOTICE, "exiting");
|
||||
ns_log_shutdown();
|
||||
diff -up bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.0rc1/bin/named-sdb/Makefile.in
|
||||
--- bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb 2011-02-21 16:28:51.628648487 +0100
|
||||
+++ bind-9.8.0rc1/bin/named-sdb/Makefile.in 2011-02-21 16:28:51.678648382 +0100
|
||||
diff -up bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.1rc1/bin/named-sdb/Makefile.in
|
||||
--- bind-9.8.1rc1/bin/named-sdb/Makefile.in.sdb 2011-08-31 14:34:23.960049438 +0200
|
||||
+++ bind-9.8.1rc1/bin/named-sdb/Makefile.in 2011-08-31 14:34:24.051049431 +0200
|
||||
@@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@
|
||||
#
|
||||
# Add database drivers here.
|
||||
@ -209,10 +209,10 @@ diff -up bind-9.8.0rc1/bin/named-sdb/Makefile.in.sdb bind-9.8.0rc1/bin/named-sdb
|
||||
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
|
||||
|
||||
@DLZ_DRIVER_RULES@
|
||||
diff -up bind-9.8.0rc1/configure.in.sdb bind-9.8.0rc1/configure.in
|
||||
--- bind-9.8.0rc1/configure.in.sdb 2011-02-03 06:50:05.000000000 +0100
|
||||
+++ bind-9.8.0rc1/configure.in 2011-02-21 16:30:15.788470563 +0100
|
||||
@@ -3285,9 +3285,12 @@ AC_CONFIG_FILES([
|
||||
diff -up bind-9.8.1rc1/configure.in.sdb bind-9.8.1rc1/configure.in
|
||||
--- bind-9.8.1rc1/configure.in.sdb 2011-07-26 23:59:57.000000000 +0200
|
||||
+++ bind-9.8.1rc1/configure.in 2011-08-31 14:34:24.053049431 +0200
|
||||
@@ -3423,9 +3423,12 @@ AC_CONFIG_FILES([
|
||||
bin/dnssec/Makefile
|
||||
bin/named/Makefile
|
||||
bin/named/unix/Makefile
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -up bind-9.8.0-P4/bin/named/main.c.dyndb bind-9.8.0-P4/bin/named/main.c
|
||||
--- bind-9.8.0-P4/bin/named/main.c.dyndb 2010-12-22 04:59:02.000000000 +0100
|
||||
+++ bind-9.8.0-P4/bin/named/main.c 2011-07-26 15:36:04.042778520 +0200
|
||||
diff -up bind-9.8.1rc1/bin/named/main.c.dyndb bind-9.8.1rc1/bin/named/main.c
|
||||
--- bind-9.8.1rc1/bin/named/main.c.dyndb 2011-03-11 07:47:00.000000000 +0100
|
||||
+++ bind-9.8.1rc1/bin/named/main.c 2011-08-31 14:25:02.244088457 +0200
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <isccc/result.h>
|
||||
|
||||
@ -9,7 +9,7 @@ diff -up bind-9.8.0-P4/bin/named/main.c.dyndb bind-9.8.0-P4/bin/named/main.c
|
||||
#include <dns/name.h>
|
||||
#include <dns/result.h>
|
||||
#include <dns/view.h>
|
||||
@@ -871,6 +872,8 @@ setup(void) {
|
||||
@@ -884,6 +885,8 @@ setup(void) {
|
||||
|
||||
static void
|
||||
cleanup(void) {
|
||||
@ -18,18 +18,18 @@ diff -up bind-9.8.0-P4/bin/named/main.c.dyndb bind-9.8.0-P4/bin/named/main.c
|
||||
destroy_managers();
|
||||
|
||||
ns_server_destroy(&ns_g_server);
|
||||
diff -up bind-9.8.0-P4/bin/named/server.c.dyndb bind-9.8.0-P4/bin/named/server.c
|
||||
--- bind-9.8.0-P4/bin/named/server.c.dyndb 2011-02-16 20:46:12.000000000 +0100
|
||||
+++ bind-9.8.0-P4/bin/named/server.c 2011-07-26 15:37:42.489778503 +0200
|
||||
@@ -63,6 +63,7 @@
|
||||
#ifdef DLZ
|
||||
diff -up bind-9.8.1rc1/bin/named/server.c.dyndb bind-9.8.1rc1/bin/named/server.c
|
||||
--- bind-9.8.1rc1/bin/named/server.c.dyndb 2011-08-02 06:58:45.000000000 +0200
|
||||
+++ bind-9.8.1rc1/bin/named/server.c 2011-08-31 14:29:04.261071645 +0200
|
||||
@@ -61,6 +61,7 @@
|
||||
#include <dns/db.h>
|
||||
#include <dns/dispatch.h>
|
||||
#include <dns/dlz.h>
|
||||
#endif
|
||||
+#include <dns/dynamic_db.h>
|
||||
#include <dns/dns64.h>
|
||||
#include <dns/forward.h>
|
||||
#include <dns/journal.h>
|
||||
@@ -1158,6 +1159,72 @@ configure_peer(const cfg_obj_t *cpeer, i
|
||||
@@ -1151,6 +1152,72 @@ configure_peer(const cfg_obj_t *cpeer, i
|
||||
}
|
||||
|
||||
static isc_result_t
|
||||
@ -102,18 +102,21 @@ diff -up bind-9.8.0-P4/bin/named/server.c.dyndb bind-9.8.0-P4/bin/named/server.c
|
||||
disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
|
||||
isc_result_t result;
|
||||
const cfg_obj_t *algorithms;
|
||||
@@ -1574,6 +1641,7 @@ configure_view(dns_view_t *view, cfg_par
|
||||
@@ -1562,6 +1629,7 @@ configure_view(dns_view_t *view, cfg_obj
|
||||
const cfg_obj_t *dlz;
|
||||
unsigned int dlzargc;
|
||||
char **dlzargv;
|
||||
#endif
|
||||
+ const cfg_obj_t *dynamic_db_list;
|
||||
const cfg_obj_t *disabled;
|
||||
const cfg_obj_t *obj;
|
||||
const cfg_listelt_t *element;
|
||||
@@ -1834,6 +1902,37 @@ configure_view(dns_view_t *view, cfg_par
|
||||
#endif
|
||||
@@ -1792,6 +1860,39 @@ configure_view(dns_view_t *view, cfg_obj
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
+
|
||||
+
|
||||
+ /*
|
||||
+ * Configure dynamic databases.
|
||||
+ */
|
||||
+ dynamic_db_list = NULL;
|
||||
@ -137,28 +140,27 @@ diff -up bind-9.8.0-P4/bin/named/server.c.dyndb bind-9.8.0-P4/bin/named/server.c
|
||||
+ while (element != NULL) {
|
||||
+ obj = cfg_listelt_value(element);
|
||||
+ CHECK(configure_dynamic_db(obj, mctx, args));
|
||||
+
|
||||
+
|
||||
+ element = cfg_list_next(element);
|
||||
+ }
|
||||
+
|
||||
+ dns_dyndb_arguments_destroy(mctx, args);
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
/*
|
||||
* Obtain configuration parameters that affect the decision of whether
|
||||
* we can reuse/share an existing cache.
|
||||
*/
|
||||
@@ -4187,6 +4286,7 @@ load_configuration(const char *filename,
|
||||
result = isc_task_beginexclusive(server->task);
|
||||
RUNTIME_CHECK(result == ISC_R_SUCCESS);
|
||||
@@ -4292,6 +4393,7 @@ load_configuration(const char *filename,
|
||||
cfg_aclconfctx_detach(&ns_g_aclconfctx);
|
||||
CHECK(cfg_aclconfctx_create(ns_g_mctx, &ns_g_aclconfctx));
|
||||
|
||||
+ dns_dynamic_db_cleanup(ISC_FALSE);
|
||||
/*
|
||||
* Parse the global default pseudo-config file.
|
||||
*/
|
||||
diff -up bind-9.8.0-P4/lib/dns/dynamic_db.c.dyndb bind-9.8.0-P4/lib/dns/dynamic_db.c
|
||||
--- bind-9.8.0-P4/lib/dns/dynamic_db.c.dyndb 2011-07-26 15:36:04.047778520 +0200
|
||||
+++ bind-9.8.0-P4/lib/dns/dynamic_db.c 2011-07-26 15:36:04.047778520 +0200
|
||||
diff -up bind-9.8.1rc1/lib/dns/dynamic_db.c.dyndb bind-9.8.1rc1/lib/dns/dynamic_db.c
|
||||
--- bind-9.8.1rc1/lib/dns/dynamic_db.c.dyndb 2011-08-31 14:25:02.249088456 +0200
|
||||
+++ bind-9.8.1rc1/lib/dns/dynamic_db.c 2011-08-31 14:25:02.249088456 +0200
|
||||
@@ -0,0 +1,366 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2008-2011 Red Hat, Inc.
|
||||
@ -526,9 +528,9 @@ diff -up bind-9.8.0-P4/lib/dns/dynamic_db.c.dyndb bind-9.8.0-P4/lib/dns/dynamic_
|
||||
+
|
||||
+ return args->timermgr;
|
||||
+}
|
||||
diff -up bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h
|
||||
--- bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h.dyndb 2011-07-26 15:36:04.047778520 +0200
|
||||
+++ bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h 2011-07-26 15:36:04.047778520 +0200
|
||||
diff -up bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h
|
||||
--- bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h.dyndb 2011-08-31 14:25:02.249088456 +0200
|
||||
+++ bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h 2011-08-31 14:25:02.249088456 +0200
|
||||
@@ -0,0 +1,50 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2008-2011 Red Hat, Inc.
|
||||
@ -580,9 +582,9 @@ diff -up bind-9.8.0-P4/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.0-P4/lib/
|
||||
+isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
|
||||
+
|
||||
+#endif
|
||||
diff -up bind-9.8.0-P4/lib/dns/include/dns/log.h.dyndb bind-9.8.0-P4/lib/dns/include/dns/log.h
|
||||
--- bind-9.8.0-P4/lib/dns/include/dns/log.h.dyndb 2009-12-18 23:16:49.000000000 +0100
|
||||
+++ bind-9.8.0-P4/lib/dns/include/dns/log.h 2011-07-26 15:36:04.048778520 +0200
|
||||
diff -up bind-9.8.1rc1/lib/dns/include/dns/log.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/log.h
|
||||
--- bind-9.8.1rc1/lib/dns/include/dns/log.h.dyndb 2009-12-18 23:16:49.000000000 +0100
|
||||
+++ bind-9.8.1rc1/lib/dns/include/dns/log.h 2011-08-31 14:25:02.250088456 +0200
|
||||
@@ -74,6 +74,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
|
||||
#define DNS_LOGMODULE_ACACHE (&dns_modules[25])
|
||||
#define DNS_LOGMODULE_DLZ (&dns_modules[26])
|
||||
@ -591,9 +593,9 @@ diff -up bind-9.8.0-P4/lib/dns/include/dns/log.h.dyndb bind-9.8.0-P4/lib/dns/inc
|
||||
|
||||
ISC_LANG_BEGINDECLS
|
||||
|
||||
diff -up bind-9.8.0-P4/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/dns/include/dns/Makefile.in
|
||||
--- bind-9.8.0-P4/lib/dns/include/dns/Makefile.in.dyndb 2009-10-09 01:48:10.000000000 +0200
|
||||
+++ bind-9.8.0-P4/lib/dns/include/dns/Makefile.in 2011-07-26 15:36:04.048778520 +0200
|
||||
diff -up bind-9.8.1rc1/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.1rc1/lib/dns/include/dns/Makefile.in
|
||||
--- bind-9.8.1rc1/lib/dns/include/dns/Makefile.in.dyndb 2011-02-28 02:20:02.000000000 +0100
|
||||
+++ bind-9.8.1rc1/lib/dns/include/dns/Makefile.in 2011-08-31 14:25:02.250088456 +0200
|
||||
@@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@
|
||||
@BIND9_VERSION@
|
||||
|
||||
@ -603,9 +605,9 @@ diff -up bind-9.8.0-P4/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/d
|
||||
dnssec.h ds.h events.h fixedname.h iptable.h journal.h \
|
||||
keyflags.h keytable.h keyvalues.h lib.h log.h \
|
||||
master.h masterdump.h message.h name.h ncache.h nsec.h \
|
||||
diff -up bind-9.8.0-P4/lib/dns/include/dns/types.h.dyndb bind-9.8.0-P4/lib/dns/include/dns/types.h
|
||||
--- bind-9.8.0-P4/lib/dns/include/dns/types.h.dyndb 2010-12-08 03:46:16.000000000 +0100
|
||||
+++ bind-9.8.0-P4/lib/dns/include/dns/types.h 2011-07-26 15:36:04.049778520 +0200
|
||||
diff -up bind-9.8.1rc1/lib/dns/include/dns/types.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/types.h
|
||||
--- bind-9.8.1rc1/lib/dns/include/dns/types.h.dyndb 2010-12-08 03:46:16.000000000 +0100
|
||||
+++ bind-9.8.1rc1/lib/dns/include/dns/types.h 2011-08-31 14:25:02.251088456 +0200
|
||||
@@ -60,6 +60,7 @@ typedef struct dns_dbtable dns_dbtable
|
||||
typedef void dns_dbversion_t;
|
||||
typedef struct dns_dlzimplementation dns_dlzimplementation_t;
|
||||
@ -614,9 +616,9 @@ diff -up bind-9.8.0-P4/lib/dns/include/dns/types.h.dyndb bind-9.8.0-P4/lib/dns/i
|
||||
typedef struct dns_sdlzimplementation dns_sdlzimplementation_t;
|
||||
typedef struct dns_decompress dns_decompress_t;
|
||||
typedef struct dns_dispatch dns_dispatch_t;
|
||||
diff -up bind-9.8.0-P4/lib/dns/log.c.dyndb bind-9.8.0-P4/lib/dns/log.c
|
||||
--- bind-9.8.0-P4/lib/dns/log.c.dyndb 2009-12-19 00:49:03.000000000 +0100
|
||||
+++ bind-9.8.0-P4/lib/dns/log.c 2011-07-26 15:36:04.049778520 +0200
|
||||
diff -up bind-9.8.1rc1/lib/dns/log.c.dyndb bind-9.8.1rc1/lib/dns/log.c
|
||||
--- bind-9.8.1rc1/lib/dns/log.c.dyndb 2009-12-19 00:49:03.000000000 +0100
|
||||
+++ bind-9.8.1rc1/lib/dns/log.c 2011-08-31 14:25:02.251088456 +0200
|
||||
@@ -80,6 +80,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
|
||||
{ "dns/acache", 0 },
|
||||
{ "dns/dlz", 0 },
|
||||
@ -625,9 +627,9 @@ diff -up bind-9.8.0-P4/lib/dns/log.c.dyndb bind-9.8.0-P4/lib/dns/log.c
|
||||
{ NULL, 0 }
|
||||
};
|
||||
|
||||
diff -up bind-9.8.0-P4/lib/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/dns/Makefile.in
|
||||
--- bind-9.8.0-P4/lib/dns/Makefile.in.dyndb 2011-07-26 15:36:04.028778520 +0200
|
||||
+++ bind-9.8.0-P4/lib/dns/Makefile.in 2011-07-26 15:36:04.050778520 +0200
|
||||
diff -up bind-9.8.1rc1/lib/dns/Makefile.in.dyndb bind-9.8.1rc1/lib/dns/Makefile.in
|
||||
--- bind-9.8.1rc1/lib/dns/Makefile.in.dyndb 2011-08-31 14:25:02.230088458 +0200
|
||||
+++ bind-9.8.1rc1/lib/dns/Makefile.in 2011-08-31 14:25:02.251088456 +0200
|
||||
@@ -58,7 +58,7 @@ DNSOBJS = acache.@O@ acl.@O@ adb.@O@ bya
|
||||
cache.@O@ callbacks.@O@ compress.@O@ \
|
||||
db.@O@ dbiterator.@O@ dbtable.@O@ diff.@O@ dispatch.@O@ \
|
||||
@ -646,7 +648,7 @@ diff -up bind-9.8.0-P4/lib/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/dns/Makefile.
|
||||
master.c masterdump.c message.c \
|
||||
name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
|
||||
rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c rdatalist.c \
|
||||
@@ -116,6 +116,11 @@ version.@O@: version.c
|
||||
@@ -118,6 +118,11 @@ version.@O@: version.c
|
||||
-DLIBAGE=${LIBAGE} \
|
||||
-c ${srcdir}/version.c
|
||||
|
||||
@ -658,9 +660,9 @@ diff -up bind-9.8.0-P4/lib/dns/Makefile.in.dyndb bind-9.8.0-P4/lib/dns/Makefile.
|
||||
libdns.@SA@: ${OBJS}
|
||||
${AR} ${ARFLAGS} $@ ${OBJS}
|
||||
${RANLIB} $@
|
||||
diff -up bind-9.8.0-P4/lib/isccfg/namedconf.c.dyndb bind-9.8.0-P4/lib/isccfg/namedconf.c
|
||||
--- bind-9.8.0-P4/lib/isccfg/namedconf.c.dyndb 2011-02-03 06:50:08.000000000 +0100
|
||||
+++ bind-9.8.0-P4/lib/isccfg/namedconf.c 2011-07-26 15:36:04.051778520 +0200
|
||||
diff -up bind-9.8.1rc1/lib/isccfg/namedconf.c.dyndb bind-9.8.1rc1/lib/isccfg/namedconf.c
|
||||
--- bind-9.8.1rc1/lib/isccfg/namedconf.c.dyndb 2011-05-23 22:56:11.000000000 +0200
|
||||
+++ bind-9.8.1rc1/lib/isccfg/namedconf.c 2011-08-31 14:25:02.253088456 +0200
|
||||
@@ -89,6 +89,7 @@ static cfg_type_t cfg_type_controls;
|
||||
static cfg_type_t cfg_type_controls_sockaddr;
|
||||
static cfg_type_t cfg_type_destinationlist;
|
||||
@ -669,7 +671,7 @@ diff -up bind-9.8.0-P4/lib/isccfg/namedconf.c.dyndb bind-9.8.0-P4/lib/isccfg/nam
|
||||
static cfg_type_t cfg_type_ixfrdifftype;
|
||||
static cfg_type_t cfg_type_key;
|
||||
static cfg_type_t cfg_type_logfile;
|
||||
@@ -861,6 +862,7 @@ namedconf_or_view_clauses[] = {
|
||||
@@ -860,6 +861,7 @@ namedconf_or_view_clauses[] = {
|
||||
{ "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI },
|
||||
/* only 1 DLZ per view allowed */
|
||||
{ "dlz", &cfg_type_dynamically_loadable_zones, 0 },
|
||||
@ -677,7 +679,7 @@ diff -up bind-9.8.0-P4/lib/isccfg/namedconf.c.dyndb bind-9.8.0-P4/lib/isccfg/nam
|
||||
{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
|
||||
{ "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
|
||||
{ "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI },
|
||||
@@ -1843,6 +1845,40 @@ static cfg_type_t cfg_type_dialuptype =
|
||||
@@ -1860,6 +1862,40 @@ static cfg_type_t cfg_type_dialuptype =
|
||||
&cfg_rep_string, dialup_enums
|
||||
};
|
||||
|
||||
|
25
bind.spec
25
bind.spec
@ -2,11 +2,11 @@
|
||||
# Red Hat BIND package .spec file
|
||||
#
|
||||
|
||||
%define PATCHVER P4
|
||||
#%define PREVER rc1
|
||||
#%define PATCHVER P4
|
||||
%define PREVER rc1
|
||||
#%define VERSION %{version}
|
||||
#%define VERSION %{version}%{PREVER}
|
||||
%define VERSION %{version}-%{PATCHVER}
|
||||
#%define VERSION %{version}-%{PATCHVER}
|
||||
%define VERSION %{version}%{PREVER}
|
||||
|
||||
%{?!SDB: %define SDB 1}
|
||||
%{?!test: %define test 0}
|
||||
@ -21,8 +21,8 @@
|
||||
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
|
||||
Name: bind
|
||||
License: ISC
|
||||
Version: 9.8.0
|
||||
Release: 9.%{PATCHVER}%{?dist}
|
||||
Version: 9.8.1
|
||||
Release: 0.1.%{PREVER}%{?dist}
|
||||
Epoch: 32
|
||||
Url: http://www.isc.org/products/BIND/
|
||||
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -61,9 +61,6 @@ Patch109:bind97-rh478718.patch
|
||||
Patch110:bind97-rh570851.patch
|
||||
Patch111:bind97-exportlib.patch
|
||||
Patch112:bind97-rh645544.patch
|
||||
Patch113:bind97-rh674334.patch
|
||||
Patch115:bind97-cleanup.patch
|
||||
Patch116:bind98-includes.patch
|
||||
Patch117:bind98-rh725741.patch
|
||||
|
||||
# SDB patches
|
||||
@ -301,9 +298,6 @@ mkdir m4
|
||||
%patch110 -p1 -b .rh570851
|
||||
%patch111 -p1 -b .exportlib
|
||||
%patch112 -p1 -b .rh645544
|
||||
%patch113 -p1 -b .rh674334
|
||||
%patch115 -p1 -b .cleanup
|
||||
%patch116 -p1 -b .includes
|
||||
|
||||
# Sparc and s390 arches need to use -fPIE
|
||||
%ifarch sparcv9 sparc64 s390 s390x
|
||||
@ -772,6 +766,13 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Aug 31 2011 Adam Tkac <atkac redhat com> 32:9.8.1-0.1.rc1
|
||||
- update to 9.8.1rc1
|
||||
- patches merged
|
||||
- bind97-rh674334.patch
|
||||
- bind97-cleanup.patch
|
||||
- bind98-includes.patch
|
||||
|
||||
* Wed Aug 03 2011 Adam Tkac <atkac redhat com> 32:9.8.0-9.P4
|
||||
- improve patch for #725741
|
||||
|
||||
|
@ -1,452 +0,0 @@
|
||||
diff -up bind-9.8.0rc1/bin/dig/dighost.c.cleanup bind-9.8.0rc1/bin/dig/dighost.c
|
||||
--- bind-9.8.0rc1/bin/dig/dighost.c.cleanup 2011-02-21 16:30:33.188433480 +0100
|
||||
+++ bind-9.8.0rc1/bin/dig/dighost.c 2011-02-21 16:30:33.198433459 +0100
|
||||
@@ -4300,7 +4300,6 @@ opentmpkey(isc_mem_t *mctx, const char *
|
||||
char *tempnamekey = NULL;
|
||||
int tempnamelen;
|
||||
int tempnamekeylen;
|
||||
- char *x;
|
||||
char *cp;
|
||||
isc_uint32_t which;
|
||||
|
||||
@@ -4323,11 +4322,11 @@ opentmpkey(isc_mem_t *mctx, const char *
|
||||
return (ISC_R_FAILURE);
|
||||
}
|
||||
|
||||
- x = cp--;
|
||||
+ cp--;
|
||||
while (cp >= tempname && *cp == 'X') {
|
||||
isc_random_get(&which);
|
||||
*cp = alphnum[which % (sizeof(alphnum) - 1)];
|
||||
- x = cp--;
|
||||
+ cp--;
|
||||
}
|
||||
|
||||
tempnamekeylen = tempnamelen+5;
|
||||
diff -up bind-9.8.0rc1/bin/dnssec/dnssec-signzone.c.cleanup bind-9.8.0rc1/bin/dnssec/dnssec-signzone.c
|
||||
--- bind-9.8.0rc1/bin/dnssec/dnssec-signzone.c.cleanup 2010-06-04 01:51:04.000000000 +0200
|
||||
+++ bind-9.8.0rc1/bin/dnssec/dnssec-signzone.c 2011-02-21 16:30:33.198433459 +0100
|
||||
@@ -1467,7 +1467,6 @@ verifyzone(void) {
|
||||
isc_boolean_t done = ISC_FALSE;
|
||||
isc_boolean_t first = ISC_TRUE;
|
||||
isc_boolean_t goodksk = ISC_FALSE;
|
||||
- isc_boolean_t goodzsk = ISC_FALSE;
|
||||
isc_result_t result;
|
||||
unsigned char revoked_ksk[256];
|
||||
unsigned char revoked_zsk[256];
|
||||
@@ -1569,7 +1568,6 @@ verifyzone(void) {
|
||||
#endif
|
||||
if (zsk_algorithms[dnskey.algorithm] != 255)
|
||||
zsk_algorithms[dnskey.algorithm]++;
|
||||
- goodzsk = ISC_TRUE;
|
||||
} else {
|
||||
if (standby_zsk[dnskey.algorithm] != 255)
|
||||
standby_zsk[dnskey.algorithm]++;
|
||||
diff -up bind-9.8.0rc1/bin/named/server.c.cleanup bind-9.8.0rc1/bin/named/server.c
|
||||
--- bind-9.8.0rc1/bin/named/server.c.cleanup 2011-02-21 16:30:33.058433757 +0100
|
||||
+++ bind-9.8.0rc1/bin/named/server.c 2011-02-21 16:30:33.198433459 +0100
|
||||
@@ -1670,7 +1670,6 @@ configure_view(dns_view_t *view, cfg_par
|
||||
isc_uint32_t max_clients_per_query;
|
||||
const char *sep = ": view ";
|
||||
const char *viewname = view->name;
|
||||
- const char *forview = " for view ";
|
||||
isc_boolean_t rfc1918;
|
||||
isc_boolean_t empty_zones_enable;
|
||||
const cfg_obj_t *disablelist = NULL;
|
||||
@@ -1718,7 +1717,6 @@ configure_view(dns_view_t *view, cfg_par
|
||||
if (!strcmp(viewname, "_default")) {
|
||||
sep = "";
|
||||
viewname = "";
|
||||
- forview = "";
|
||||
}
|
||||
|
||||
/*
|
||||
diff -up bind-9.8.0rc1/contrib/dlz/drivers/dlz_postgres_driver.c.cleanup bind-9.8.0rc1/contrib/dlz/drivers/dlz_postgres_driver.c
|
||||
--- bind-9.8.0rc1/contrib/dlz/drivers/dlz_postgres_driver.c.cleanup 2010-12-18 02:56:21.000000000 +0100
|
||||
+++ bind-9.8.0rc1/contrib/dlz/drivers/dlz_postgres_driver.c 2011-02-21 16:30:33.198433459 +0100
|
||||
@@ -292,8 +292,10 @@ postgres_get_resultset(const char *zone,
|
||||
unsigned int i = 0;
|
||||
unsigned int j = 0;
|
||||
|
||||
+#if 0
|
||||
/* temporarily get a unique thread # */
|
||||
unsigned int dlz_thread_num = 1+(int) (1000.0*rand()/(RAND_MAX+1.0));
|
||||
+#endif
|
||||
|
||||
REQUIRE(*rs == NULL);
|
||||
|
||||
diff -up bind-9.8.0rc1/lib/bind9/check.c.cleanup bind-9.8.0rc1/lib/bind9/check.c
|
||||
--- bind-9.8.0rc1/lib/bind9/check.c.cleanup 2011-01-08 00:47:07.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/bind9/check.c 2011-02-21 16:30:33.198433459 +0100
|
||||
@@ -1997,8 +1997,6 @@ check_trusted_key(const cfg_obj_t *key,
|
||||
isc_log_t *logctx)
|
||||
{
|
||||
const char *keystr, *keynamestr;
|
||||
- dns_fixedname_t fkeyname;
|
||||
- dns_name_t *keyname;
|
||||
isc_buffer_t keydatabuf;
|
||||
isc_region_t r;
|
||||
isc_result_t result = ISC_R_SUCCESS;
|
||||
@@ -2009,7 +2007,6 @@ check_trusted_key(const cfg_obj_t *key,
|
||||
flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags"));
|
||||
proto = cfg_obj_asuint32(cfg_tuple_get(key, "protocol"));
|
||||
alg = cfg_obj_asuint32(cfg_tuple_get(key, "algorithm"));
|
||||
- keyname = dns_fixedname_name(&fkeyname);
|
||||
keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name"));
|
||||
|
||||
if (flags > 0xffff) {
|
||||
diff -up bind-9.8.0rc1/lib/dns/adb.c.cleanup bind-9.8.0rc1/lib/dns/adb.c
|
||||
--- bind-9.8.0rc1/lib/dns/adb.c.cleanup 2010-12-22 00:47:08.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/adb.c 2011-02-21 16:30:33.198433459 +0100
|
||||
@@ -2195,7 +2195,6 @@ check_expire_name(dns_adbname_t **namep,
|
||||
static void
|
||||
check_stale_name(dns_adb_t *adb, int bucket, isc_stdtime_t now) {
|
||||
int victims, max_victims;
|
||||
- isc_boolean_t result;
|
||||
dns_adbname_t *victim, *next_victim;
|
||||
isc_boolean_t overmem = isc_mem_isovermem(adb->mctx);
|
||||
int scans = 0;
|
||||
@@ -2217,7 +2216,7 @@ check_stale_name(dns_adb_t *adb, int buc
|
||||
INSIST(!NAME_DEAD(victim));
|
||||
scans++;
|
||||
next_victim = ISC_LIST_PREV(victim, plink);
|
||||
- result = check_expire_name(&victim, now);
|
||||
+ (void) check_expire_name(&victim, now);
|
||||
if (victim == NULL) {
|
||||
victims++;
|
||||
goto next;
|
||||
diff -up bind-9.8.0rc1/lib/dns/diff.c.cleanup bind-9.8.0rc1/lib/dns/diff.c
|
||||
--- bind-9.8.0rc1/lib/dns/diff.c.cleanup 2009-12-01 01:47:09.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/diff.c 2011-02-21 16:30:33.198433459 +0100
|
||||
@@ -264,7 +264,6 @@ diff_apply(dns_diff_t *diff, dns_db_t *d
|
||||
dns_rdataset_t rds;
|
||||
dns_rdataset_t ardataset;
|
||||
dns_rdataset_t *modified = NULL;
|
||||
- isc_boolean_t offline;
|
||||
|
||||
op = t->op;
|
||||
type = t->rdata.type;
|
||||
@@ -301,7 +300,6 @@ diff_apply(dns_diff_t *diff, dns_db_t *d
|
||||
CHECK(dns_db_findnsec3node(db, name, ISC_TRUE,
|
||||
&node));
|
||||
|
||||
- offline = ISC_FALSE;
|
||||
while (t != NULL &&
|
||||
dns_name_equal(&t->name, name) &&
|
||||
t->op == op &&
|
||||
@@ -323,8 +321,6 @@ diff_apply(dns_diff_t *diff, dns_db_t *d
|
||||
namebuf, typebuf, classbuf,
|
||||
(unsigned long) t->ttl,
|
||||
(unsigned long) rdl.ttl);
|
||||
- if (t->rdata.flags & DNS_RDATA_OFFLINE)
|
||||
- offline = ISC_TRUE;
|
||||
ISC_LIST_APPEND(rdl.rdata, &t->rdata, link);
|
||||
t = ISC_LIST_NEXT(t, link);
|
||||
}
|
||||
diff -up bind-9.8.0rc1/lib/dns/dnssec.c.cleanup bind-9.8.0rc1/lib/dns/dnssec.c
|
||||
--- bind-9.8.0rc1/lib/dns/dnssec.c.cleanup 2010-01-14 00:48:59.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/dnssec.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -1068,7 +1068,6 @@ isc_result_t
|
||||
dns_dnsseckey_create(isc_mem_t *mctx, dst_key_t **dstkey,
|
||||
dns_dnsseckey_t **dkp)
|
||||
{
|
||||
- isc_result_t result;
|
||||
dns_dnsseckey_t *dk;
|
||||
int major, minor;
|
||||
|
||||
@@ -1094,7 +1093,7 @@ dns_dnsseckey_create(isc_mem_t *mctx, ds
|
||||
dk->ksk = ISC_TF((dst_key_flags(dk->key) & DNS_KEYFLAG_KSK) != 0);
|
||||
|
||||
/* Is this an old-style key? */
|
||||
- result = dst_key_getprivateformat(dk->key, &major, &minor);
|
||||
+ (void) dst_key_getprivateformat(dk->key, &major, &minor);
|
||||
|
||||
/* Smart signing started with key format 1.3 */
|
||||
dk->legacy = ISC_TF(major == 1 && minor <= 2);
|
||||
@@ -1673,9 +1672,6 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_
|
||||
|
||||
/* No match found in keys; add the new key. */
|
||||
if (key2 == NULL) {
|
||||
- dns_dnsseckey_t *next;
|
||||
-
|
||||
- next = ISC_LIST_NEXT(key1, link);
|
||||
ISC_LIST_UNLINK(*newkeys, key1, link);
|
||||
ISC_LIST_APPEND(*keys, key1, link);
|
||||
|
||||
diff -up bind-9.8.0rc1/lib/dns/gssapictx.c.cleanup bind-9.8.0rc1/lib/dns/gssapictx.c
|
||||
--- bind-9.8.0rc1/lib/dns/gssapictx.c.cleanup 2011-01-10 04:49:49.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/gssapictx.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -121,7 +121,6 @@ name_to_gbuffer(dns_name_t *name, isc_bu
|
||||
{
|
||||
dns_name_t tname, *namep;
|
||||
isc_region_t r;
|
||||
- isc_result_t result;
|
||||
|
||||
if (!dns_name_isabsolute(name))
|
||||
namep = name;
|
||||
@@ -134,7 +133,7 @@ name_to_gbuffer(dns_name_t *name, isc_bu
|
||||
namep = &tname;
|
||||
}
|
||||
|
||||
- result = dns_name_toprincipal(namep, buffer);
|
||||
+ (void) dns_name_toprincipal(namep, buffer);
|
||||
isc_buffer_putuint8(buffer, 0);
|
||||
isc_buffer_usedregion(buffer, &r);
|
||||
REGION_TO_GBUFFER(r, *gbuffer);
|
||||
diff -up bind-9.8.0rc1/lib/dns/rdata/generic/dlv_32769.c.cleanup bind-9.8.0rc1/lib/dns/rdata/generic/dlv_32769.c
|
||||
--- bind-9.8.0rc1/lib/dns/rdata/generic/dlv_32769.c.cleanup 2010-12-24 00:47:08.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/rdata/generic/dlv_32769.c 2011-02-21 16:32:03.818238782 +0100
|
||||
@@ -33,7 +33,6 @@ static inline isc_result_t
|
||||
fromtext_dlv(ARGS_FROMTEXT) {
|
||||
isc_token_t token;
|
||||
unsigned char c;
|
||||
- int length;
|
||||
|
||||
REQUIRE(type == 32769);
|
||||
|
||||
@@ -71,23 +70,6 @@ fromtext_dlv(ARGS_FROMTEXT) {
|
||||
RETERR(uint8_tobuffer(token.value.as_ulong, target));
|
||||
c = (unsigned char) token.value.as_ulong;
|
||||
|
||||
- /*
|
||||
- * Digest.
|
||||
- */
|
||||
- switch (c) {
|
||||
- case DNS_DSDIGEST_SHA1:
|
||||
- length = ISC_SHA1_DIGESTLENGTH;
|
||||
- break;
|
||||
- case DNS_DSDIGEST_SHA256:
|
||||
- length = ISC_SHA256_DIGESTLENGTH;
|
||||
- break;
|
||||
- case DNS_DSDIGEST_GOST:
|
||||
- length = ISC_GOST_DIGESTLENGTH;
|
||||
- break;
|
||||
- default:
|
||||
- length = -1;
|
||||
- break;
|
||||
- }
|
||||
return (isc_hex_tobuffer(lexer, target, -1));
|
||||
}
|
||||
|
||||
diff -up bind-9.8.0rc1/lib/dns/request.c.cleanup bind-9.8.0rc1/lib/dns/request.c
|
||||
--- bind-9.8.0rc1/lib/dns/request.c.cleanup 2010-03-05 00:50:34.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/request.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -428,12 +428,10 @@ req_send(dns_request_t *request, isc_tas
|
||||
isc_region_t r;
|
||||
isc_socket_t *socket;
|
||||
isc_result_t result;
|
||||
- unsigned int dispattr;
|
||||
|
||||
req_log(ISC_LOG_DEBUG(3), "req_send: request %p", request);
|
||||
|
||||
REQUIRE(VALID_REQUEST(request));
|
||||
- dispattr = dns_dispatch_getattributes(request->dispatch);
|
||||
socket = req_getsocket(request);
|
||||
isc_buffer_usedregion(request->query, &r);
|
||||
/*
|
||||
diff -up bind-9.8.0rc1/lib/dns/tkey.c.cleanup bind-9.8.0rc1/lib/dns/tkey.c
|
||||
--- bind-9.8.0rc1/lib/dns/tkey.c.cleanup 2011-01-09 00:47:01.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/tkey.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -70,10 +70,9 @@ static void
|
||||
_dns_tkey_dumpmessage(dns_message_t *msg) {
|
||||
isc_buffer_t outbuf;
|
||||
unsigned char output[4096];
|
||||
- isc_result_t result;
|
||||
|
||||
isc_buffer_init(&outbuf, output, sizeof(output));
|
||||
- result = dns_message_totext(msg, &dns_master_style_debug, 0,
|
||||
+ (void) dns_message_totext(msg, &dns_master_style_debug, 0,
|
||||
&outbuf);
|
||||
/* XXXMLG ignore result */
|
||||
fprintf(stderr, "%.*s\n", (int)isc_buffer_usedlength(&outbuf),
|
||||
diff -up bind-9.8.0rc1/lib/dns/validator.c.cleanup bind-9.8.0rc1/lib/dns/validator.c
|
||||
--- bind-9.8.0rc1/lib/dns/validator.c.cleanup 2010-12-23 05:07:58.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/validator.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -1231,7 +1231,6 @@ authvalidated(isc_task_t *task, isc_even
|
||||
dns_validatorevent_t *devent;
|
||||
dns_validator_t *val;
|
||||
dns_rdataset_t *rdataset;
|
||||
- dns_rdataset_t *sigrdataset;
|
||||
isc_boolean_t want_destroy;
|
||||
isc_result_t result;
|
||||
isc_boolean_t exists, data;
|
||||
@@ -1241,7 +1240,6 @@ authvalidated(isc_task_t *task, isc_even
|
||||
|
||||
devent = (dns_validatorevent_t *)event;
|
||||
rdataset = devent->rdataset;
|
||||
- sigrdataset = devent->sigrdataset;
|
||||
val = devent->ev_arg;
|
||||
result = devent->result;
|
||||
dns_validator_destroy(&val->subvalidator);
|
||||
diff -up bind-9.8.0rc1/lib/dns/zone.c.cleanup bind-9.8.0rc1/lib/dns/zone.c
|
||||
--- bind-9.8.0rc1/lib/dns/zone.c.cleanup 2011-02-07 01:14:30.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/zone.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -5668,11 +5668,11 @@ zone_nsec3chain(dns_zone_t *zone) {
|
||||
dns_nsec3chainlist_t cleanup;
|
||||
dst_key_t *zone_keys[MAXZONEKEYS];
|
||||
isc_int32_t signatures;
|
||||
- isc_boolean_t check_ksk, keyset_kskonly, is_ksk;
|
||||
+ isc_boolean_t check_ksk, keyset_kskonly;
|
||||
isc_boolean_t delegation;
|
||||
isc_boolean_t first;
|
||||
isc_result_t result;
|
||||
- isc_stdtime_t now, inception, soaexpire, expire, stop;
|
||||
+ isc_stdtime_t now, inception, soaexpire, expire;
|
||||
isc_uint32_t jitter;
|
||||
unsigned int i;
|
||||
unsigned int nkeys = 0;
|
||||
@@ -5737,7 +5737,6 @@ zone_nsec3chain(dns_zone_t *zone) {
|
||||
*/
|
||||
isc_random_get(&jitter);
|
||||
expire = soaexpire - jitter % 3600;
|
||||
- stop = now + 5;
|
||||
|
||||
check_ksk = DNS_ZONE_OPTION(zone, DNS_ZONEOPT_UPDATECHECKKSK);
|
||||
keyset_kskonly = DNS_ZONE_OPTION(zone, DNS_ZONEOPT_DNSKEYKSKONLY);
|
||||
@@ -5783,7 +5782,6 @@ zone_nsec3chain(dns_zone_t *zone) {
|
||||
if (NSEC3REMOVE(nsec3chain->nsec3param.flags))
|
||||
goto next_addchain;
|
||||
|
||||
- is_ksk = ISC_FALSE;
|
||||
delegation = ISC_FALSE;
|
||||
dns_dbiterator_current(nsec3chain->dbiterator, &node, name);
|
||||
|
||||
@@ -6502,12 +6500,11 @@ zone_sign(dns_zone_t *zone) {
|
||||
isc_boolean_t build_nsec3 = ISC_FALSE;
|
||||
isc_boolean_t first;
|
||||
isc_result_t result;
|
||||
- isc_stdtime_t now, inception, soaexpire, expire, stop;
|
||||
+ isc_stdtime_t now, inception, soaexpire, expire;
|
||||
isc_uint32_t jitter;
|
||||
unsigned int i, j;
|
||||
unsigned int nkeys = 0;
|
||||
isc_uint32_t nodes;
|
||||
- isc_boolean_t was_ksk;
|
||||
|
||||
dns_rdataset_init(&rdataset);
|
||||
dns_fixedname_init(&fixed);
|
||||
@@ -6559,7 +6556,6 @@ zone_sign(dns_zone_t *zone) {
|
||||
*/
|
||||
isc_random_get(&jitter);
|
||||
expire = soaexpire - jitter % 3600;
|
||||
- stop = now + 5;
|
||||
|
||||
/*
|
||||
* We keep pulling nodes off each iterator in turn until
|
||||
@@ -6604,8 +6600,6 @@ zone_sign(dns_zone_t *zone) {
|
||||
|
||||
delegation = ISC_FALSE;
|
||||
|
||||
- was_ksk = ISC_FALSE;
|
||||
-
|
||||
if (first && signing->delete) {
|
||||
/*
|
||||
* Remove the key we are deleting from consideration.
|
||||
diff -up bind-9.8.0rc1/lib/isc/httpd.c.cleanup bind-9.8.0rc1/lib/isc/httpd.c
|
||||
--- bind-9.8.0rc1/lib/isc/httpd.c.cleanup 2010-11-16 06:38:31.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/isc/httpd.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -912,7 +912,6 @@ isc_httpd_senddone(isc_task_t *task, isc
|
||||
{
|
||||
isc_httpd_t *httpd = ev->ev_arg;
|
||||
isc_region_t r;
|
||||
- isc_result_t result;
|
||||
isc_socketevent_t *sev = (isc_socketevent_t *)ev;
|
||||
|
||||
ENTER("senddone");
|
||||
@@ -963,8 +962,8 @@ isc_httpd_senddone(isc_task_t *task, isc
|
||||
|
||||
r.base = (unsigned char *)httpd->recvbuf;
|
||||
r.length = HTTP_RECVLEN - 1;
|
||||
- result = isc_socket_recv(httpd->sock, &r, 1, task, isc_httpd_recvdone,
|
||||
- httpd);
|
||||
+ (void) isc_socket_recv(httpd->sock, &r, 1, task, isc_httpd_recvdone,
|
||||
+ httpd);
|
||||
|
||||
out:
|
||||
isc_event_free(&ev);
|
||||
diff -up bind-9.8.0rc1/lib/isc/string.c.cleanup bind-9.8.0rc1/lib/isc/string.c
|
||||
--- bind-9.8.0rc1/lib/isc/string.c.cleanup 2007-06-20 01:47:17.000000000 +0200
|
||||
+++ bind-9.8.0rc1/lib/isc/string.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -167,12 +167,11 @@ isc_string_printf(char *target, size_t s
|
||||
void
|
||||
isc_string_printf_truncate(char *target, size_t size, const char *format, ...) {
|
||||
va_list args;
|
||||
- size_t n;
|
||||
|
||||
REQUIRE(size > 0U);
|
||||
|
||||
va_start(args, format);
|
||||
- n = vsnprintf(target, size, format, args);
|
||||
+ (void) vsnprintf(target, size, format, args);
|
||||
va_end(args);
|
||||
|
||||
ENSURE(strlen(target) < size);
|
||||
diff -up bind-9.8.0rc1/lib/isc/timer.c.cleanup bind-9.8.0rc1/lib/isc/timer.c
|
||||
--- bind-9.8.0rc1/lib/isc/timer.c.cleanup 2011-02-03 06:50:07.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/isc/timer.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -333,7 +333,9 @@ schedule(isc__timer_t *timer, isc_time_t
|
||||
|
||||
static inline void
|
||||
deschedule(isc__timer_t *timer) {
|
||||
+#ifdef USE_TIMER_THREAD
|
||||
isc_boolean_t need_wakeup = ISC_FALSE;
|
||||
+#endif /* USE_TIMER_THREAD */
|
||||
isc__timermgr_t *manager;
|
||||
|
||||
/*
|
||||
@@ -342,8 +344,10 @@ deschedule(isc__timer_t *timer) {
|
||||
|
||||
manager = timer->manager;
|
||||
if (timer->index > 0) {
|
||||
+#ifdef USE_TIMER_THREAD
|
||||
if (timer->index == 1)
|
||||
need_wakeup = ISC_TRUE;
|
||||
+#endif /* USE_TIMER_THREAD */
|
||||
isc_heap_delete(manager->heap, timer->index);
|
||||
timer->index = 0;
|
||||
INSIST(manager->nscheduled > 0);
|
||||
diff -up bind-9.8.0rc1/lib/isc/unix/socket.c.cleanup bind-9.8.0rc1/lib/isc/unix/socket.c
|
||||
--- bind-9.8.0rc1/lib/isc/unix/socket.c.cleanup 2011-02-03 06:50:07.000000000 +0100
|
||||
+++ bind-9.8.0rc1/lib/isc/unix/socket.c 2011-02-21 16:30:33.208433438 +0100
|
||||
@@ -2752,7 +2752,6 @@ isc__socket_close(isc_socket_t *sock0) {
|
||||
isc__socket_t *sock = (isc__socket_t *)sock0;
|
||||
int fd;
|
||||
isc__socketmgr_t *manager;
|
||||
- isc_sockettype_t type;
|
||||
|
||||
REQUIRE(VALID_SOCKET(sock));
|
||||
|
||||
@@ -2772,7 +2771,6 @@ isc__socket_close(isc_socket_t *sock0) {
|
||||
INSIST(sock->connect_ev == NULL);
|
||||
|
||||
manager = sock->manager;
|
||||
- type = sock->type;
|
||||
fd = sock->fd;
|
||||
sock->fd = -1;
|
||||
memset(sock->name, 0, sizeof(sock->name));
|
||||
@@ -3690,7 +3688,6 @@ static isc_threadresult_t
|
||||
watcher(void *uap) {
|
||||
isc__socketmgr_t *manager = uap;
|
||||
isc_boolean_t done;
|
||||
- int ctlfd;
|
||||
int cc;
|
||||
#ifdef USE_KQUEUE
|
||||
const char *fnname = "kevent()";
|
||||
@@ -3702,6 +3699,7 @@ watcher(void *uap) {
|
||||
#elif defined (USE_SELECT)
|
||||
const char *fnname = "select()";
|
||||
int maxfd;
|
||||
+ int ctlfd;
|
||||
#endif
|
||||
char strbuf[ISC_STRERRORSIZE];
|
||||
#ifdef ISC_SOCKET_USE_POLLWATCH
|
||||
@@ -3711,7 +3709,9 @@ watcher(void *uap) {
|
||||
/*
|
||||
* Get the control fd here. This will never change.
|
||||
*/
|
||||
+#ifdef USE_SELECT
|
||||
ctlfd = manager->pipe_fds[0];
|
||||
+#endif
|
||||
done = ISC_FALSE;
|
||||
while (!done) {
|
||||
do {
|
@ -70,7 +70,7 @@ diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
|
||||
install:: timestamp installdirs
|
||||
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ \
|
||||
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns-export.@A@ \
|
||||
${DESTDIR}${export_libdir}
|
||||
${DESTDIR}${export_libdir}/
|
||||
|
||||
clean distclean::
|
||||
- rm -f libdns.@A@ timestamp
|
||||
@ -122,7 +122,7 @@ diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
|
||||
install:: timestamp installdirs
|
||||
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs.@A@ \
|
||||
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libirs-export.@A@ \
|
||||
${DESTDIR}${export_libdir}
|
||||
${DESTDIR}${export_libdir}/
|
||||
|
||||
clean distclean::
|
||||
- rm -f libirs.@A@ libirs.la timestamp
|
||||
@ -173,7 +173,7 @@ diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib
|
||||
install:: timestamp installdirs
|
||||
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ \
|
||||
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccfg-export.@A@ \
|
||||
${DESTDIR}${export_libdir}
|
||||
${DESTDIR}${export_libdir}/
|
||||
|
||||
clean distclean::
|
||||
- rm -f libisccfg.@A@ timestamp
|
||||
|
@ -1,122 +0,0 @@
|
||||
diff -up bind-9.7.3/bin/dig/dig.c.rh674334 bind-9.7.3/bin/dig/dig.c
|
||||
--- bind-9.7.3/bin/dig/dig.c.rh674334 2010-05-13 02:42:26.000000000 +0200
|
||||
+++ bind-9.7.3/bin/dig/dig.c 2011-02-18 13:37:45.830518968 +0100
|
||||
@@ -44,8 +44,6 @@
|
||||
#include <dns/result.h>
|
||||
#include <dns/tsig.h>
|
||||
|
||||
-#include <bind9/getaddresses.h>
|
||||
-
|
||||
#include <dig/dig.h>
|
||||
|
||||
#define ADD_STRING(b, s) { \
|
||||
@@ -1429,30 +1427,6 @@ preparse_args(int argc, char **argv) {
|
||||
}
|
||||
|
||||
static void
|
||||
-getaddresses(dig_lookup_t *lookup, const char *host) {
|
||||
- isc_result_t result;
|
||||
- isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
|
||||
- isc_netaddr_t netaddr;
|
||||
- int count, i;
|
||||
- dig_server_t *srv;
|
||||
- char tmp[ISC_NETADDR_FORMATSIZE];
|
||||
-
|
||||
- result = bind9_getaddresses(host, 0, sockaddrs,
|
||||
- DIG_MAX_ADDRESSES, &count);
|
||||
- if (result != ISC_R_SUCCESS)
|
||||
- fatal("couldn't get address for '%s': %s",
|
||||
- host, isc_result_totext(result));
|
||||
-
|
||||
- for (i = 0; i < count; i++) {
|
||||
- isc_netaddr_fromsockaddr(&netaddr, &sockaddrs[i]);
|
||||
- isc_netaddr_format(&netaddr, tmp, sizeof(tmp));
|
||||
- srv = make_server(tmp, host);
|
||||
- ISC_LIST_APPEND(lookup->my_server_list, srv, link);
|
||||
- }
|
||||
- addresscount = count;
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
|
||||
int argc, char **argv) {
|
||||
isc_result_t result;
|
||||
@@ -1546,7 +1520,7 @@ parse_args(isc_boolean_t is_batchfile, i
|
||||
if (strncmp(rv[0], "%", 1) == 0)
|
||||
break;
|
||||
if (strncmp(rv[0], "@", 1) == 0) {
|
||||
- getaddresses(lookup, &rv[0][1]);
|
||||
+ addresscount = getaddresses(lookup, &rv[0][1]);
|
||||
} else if (rv[0][0] == '+') {
|
||||
plus_option(&rv[0][1], is_batchfile,
|
||||
lookup);
|
||||
diff -up bind-9.7.3/bin/dig/dighost.c.rh674334 bind-9.7.3/bin/dig/dighost.c
|
||||
--- bind-9.7.3/bin/dig/dighost.c.rh674334 2011-02-18 13:37:45.820518990 +0100
|
||||
+++ bind-9.7.3/bin/dig/dighost.c 2011-02-18 13:37:45.830518968 +0100
|
||||
@@ -1808,8 +1808,7 @@ followup_lookup(dns_message_t *msg, dig_
|
||||
dns_rdata_freestruct(&ns);
|
||||
|
||||
/* Initialize lookup if we've not yet */
|
||||
- debug("found NS %d %s", numLookups, namestr);
|
||||
- numLookups++;
|
||||
+ debug("found NS %s", namestr);
|
||||
if (!success) {
|
||||
success = ISC_TRUE;
|
||||
lookup_counter++;
|
||||
@@ -1831,9 +1830,8 @@ followup_lookup(dns_message_t *msg, dig_
|
||||
domain = dns_fixedname_name(&lookup->fdomain);
|
||||
dns_name_copy(name, domain, NULL);
|
||||
}
|
||||
- srv = make_server(namestr, namestr);
|
||||
- debug("adding server %s", srv->servername);
|
||||
- ISC_LIST_APPEND(lookup->my_server_list, srv, link);
|
||||
+ debug("adding server %s", namestr);
|
||||
+ numLookups += getaddresses(lookup, namestr);
|
||||
dns_rdata_reset(&rdata);
|
||||
}
|
||||
}
|
||||
@@ -3608,6 +3606,31 @@ get_address(char *host, in_port_t port,
|
||||
return (ISC_R_SUCCESS);
|
||||
}
|
||||
|
||||
+int
|
||||
+getaddresses(dig_lookup_t *lookup, const char *host) {
|
||||
+ isc_result_t result;
|
||||
+ isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
|
||||
+ isc_netaddr_t netaddr;
|
||||
+ int count, i;
|
||||
+ dig_server_t *srv;
|
||||
+ char tmp[ISC_NETADDR_FORMATSIZE];
|
||||
+
|
||||
+ result = bind9_getaddresses(host, 0, sockaddrs,
|
||||
+ DIG_MAX_ADDRESSES, &count);
|
||||
+ if (result != ISC_R_SUCCESS)
|
||||
+ fatal("couldn't get address for '%s': %s",
|
||||
+ host, isc_result_totext(result));
|
||||
+
|
||||
+ for (i = 0; i < count; i++) {
|
||||
+ isc_netaddr_fromsockaddr(&netaddr, &sockaddrs[i]);
|
||||
+ isc_netaddr_format(&netaddr, tmp, sizeof(tmp));
|
||||
+ srv = make_server(tmp, host);
|
||||
+ ISC_LIST_APPEND(lookup->my_server_list, srv, link);
|
||||
+ }
|
||||
+
|
||||
+ return count;
|
||||
+}
|
||||
+
|
||||
/*%
|
||||
* Initiate either a TCP or UDP lookup
|
||||
*/
|
||||
diff -up bind-9.7.3/bin/dig/include/dig/dig.h.rh674334 bind-9.7.3/bin/dig/include/dig/dig.h
|
||||
--- bind-9.7.3/bin/dig/include/dig/dig.h.rh674334 2011-02-18 13:37:45.820518990 +0100
|
||||
+++ bind-9.7.3/bin/dig/include/dig/dig.h 2011-02-18 13:37:45.830518968 +0100
|
||||
@@ -289,6 +289,9 @@ extern int idnoptions;
|
||||
isc_result_t
|
||||
get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr);
|
||||
|
||||
+int
|
||||
+getaddresses(dig_lookup_t *lookup, const char *host);
|
||||
+
|
||||
isc_result_t
|
||||
get_reverse(char *reverse, size_t len, char *value, isc_boolean_t ip6_int,
|
||||
isc_boolean_t strict);
|
@ -1,12 +0,0 @@
|
||||
diff -up bind-9.8.0rc1/lib/dns/include/dns/Makefile.in.includes bind-9.8.0rc1/lib/dns/include/dns/Makefile.in
|
||||
--- bind-9.8.0rc1/lib/dns/include/dns/Makefile.in.includes 2011-02-22 12:09:51.502603050 +0100
|
||||
+++ bind-9.8.0rc1/lib/dns/include/dns/Makefile.in 2011-02-22 12:10:07.692556291 +0100
|
||||
@@ -29,7 +29,7 @@ HEADERS = acl.h adb.h byaddr.h cache.h c
|
||||
peer.h portlist.h private.h rbt.h rcode.h \
|
||||
rdata.h rdataclass.h rdatalist.h rdataset.h rdatasetiter.h \
|
||||
rdataslab.h rdatatype.h request.h resolver.h result.h \
|
||||
- rootns.h sdb.h sdlz.h secalg.h secproto.h soa.h ssu.h \
|
||||
+ rootns.h rpz.h sdb.h sdlz.h secalg.h secproto.h soa.h ssu.h \
|
||||
tcpmsg.h time.h tkey.h tsig.h ttl.h types.h \
|
||||
validator.h version.h view.h xfrin.h zone.h zonekey.h zt.h
|
||||
|
Loading…
Reference in New Issue
Block a user