diff options
Diffstat (limited to 'bind-96-dyndb.patch')
| -rw-r--r-- | bind-96-dyndb.patch | 100 |
1 files changed, 51 insertions, 49 deletions
diff --git a/bind-96-dyndb.patch b/bind-96-dyndb.patch index 94bf019..176be49 100644 --- a/bind-96-dyndb.patch +++ b/bind-96-dyndb.patch @@ -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 }; |