diff options
author | Adam Tkac <atkac@fedoraproject.org> | 2009-09-16 11:09:13 +0000 |
---|---|---|
committer | Adam Tkac <atkac@fedoraproject.org> | 2009-09-16 11:09:13 +0000 |
commit | e99cc3499f9be9e31fad2581105352acadee85fa (patch) | |
tree | c995d084c8a8f772ed92f9ad87cf0b3b98a5ef16 /bind-96-dyndb.patch | |
parent | 2af3ea715d9025d88d4fda0db72b74fbe3a06b9a (diff) | |
download | bind-e99cc3499f9be9e31fad2581105352acadee85fa.tar.gz bind-e99cc3499f9be9e31fad2581105352acadee85fa.tar.xz bind-e99cc3499f9be9e31fad2581105352acadee85fa.zip |
- update to 9.7.0a3bind-9_7_0-0_3_a3_fc13
Diffstat (limited to 'bind-96-dyndb.patch')
-rw-r--r-- | bind-96-dyndb.patch | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/bind-96-dyndb.patch b/bind-96-dyndb.patch index 3e505ac..4966fd1 100644 --- a/bind-96-dyndb.patch +++ b/bind-96-dyndb.patch @@ -1,7 +1,7 @@ -diff -up bind-9.7.0a2/bin/named/main.c.dyndb bind-9.7.0a2/bin/named/main.c ---- bind-9.7.0a2/bin/named/main.c.dyndb 2009-05-07 11:33:52.000000000 +0200 -+++ bind-9.7.0a2/bin/named/main.c 2009-09-15 14:35:49.054494598 +0200 -@@ -44,6 +44,7 @@ +diff -up bind-9.7.0a3/bin/named/main.c.dyndb bind-9.7.0a3/bin/named/main.c +--- bind-9.7.0a3/bin/named/main.c.dyndb 2009-09-01 20:40:25.000000000 +0200 ++++ bind-9.7.0a3/bin/named/main.c 2009-09-16 10:47:35.744643926 +0200 +@@ -45,6 +45,7 @@ #include <isccc/result.h> #include <dns/dispatch.h> @@ -9,7 +9,7 @@ diff -up bind-9.7.0a2/bin/named/main.c.dyndb bind-9.7.0a2/bin/named/main.c #include <dns/name.h> #include <dns/result.h> #include <dns/view.h> -@@ -770,6 +771,8 @@ setup(void) { +@@ -844,6 +845,8 @@ setup(void) { static void cleanup(void) { @@ -18,9 +18,9 @@ diff -up bind-9.7.0a2/bin/named/main.c.dyndb bind-9.7.0a2/bin/named/main.c destroy_managers(); ns_server_destroy(&ns_g_server); -diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c ---- bind-9.7.0a2/bin/named/server.c.dyndb 2009-08-05 19:35:33.000000000 +0200 -+++ bind-9.7.0a2/bin/named/server.c 2009-09-15 14:35:49.064494786 +0200 +diff -up bind-9.7.0a3/bin/named/server.c.dyndb bind-9.7.0a3/bin/named/server.c +--- bind-9.7.0a3/bin/named/server.c.dyndb 2009-09-10 03:49:29.000000000 +0200 ++++ bind-9.7.0a3/bin/named/server.c 2009-09-16 10:47:35.744643926 +0200 @@ -58,6 +58,7 @@ #ifdef DLZ #include <dns/dlz.h> @@ -29,7 +29,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c #include <dns/forward.h> #include <dns/journal.h> #include <dns/keytable.h> -@@ -1036,6 +1037,72 @@ configure_peer(const cfg_obj_t *cpeer, i +@@ -1054,6 +1055,72 @@ configure_peer(const cfg_obj_t *cpeer, i } static isc_result_t @@ -102,7 +102,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) { isc_result_t result; const cfg_obj_t *algorithms; -@@ -1245,6 +1312,7 @@ configure_view(dns_view_t *view, const c +@@ -1263,6 +1330,7 @@ configure_view(dns_view_t *view, const c unsigned int dlzargc; char **dlzargv; #endif @@ -110,7 +110,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c const cfg_obj_t *disabled; const cfg_obj_t *obj; const cfg_listelt_t *element; -@@ -1429,6 +1497,37 @@ configure_view(dns_view_t *view, const c +@@ -1447,6 +1515,37 @@ configure_view(dns_view_t *view, const c #endif /* @@ -148,7 +148,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c * Obtain configuration parameters that affect the decision of whether * we can reuse/share an existing cache. */ -@@ -3581,6 +3680,7 @@ load_configuration(const char *filename, +@@ -3598,6 +3697,7 @@ load_configuration(const char *filename, result = isc_task_beginexclusive(server->task); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -156,7 +156,7 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c /* * Parse the global default pseudo-config file. */ -@@ -4927,6 +5027,8 @@ loadconfig(ns_server_t *server) { +@@ -4944,6 +5044,8 @@ loadconfig(ns_server_t *server) { static isc_result_t reload(ns_server_t *server) { isc_result_t result; @@ -165,9 +165,9 @@ diff -up bind-9.7.0a2/bin/named/server.c.dyndb bind-9.7.0a2/bin/named/server.c CHECK(loadconfig(server)); result = load_zones(server, ISC_FALSE); -diff -up /dev/null bind-9.7.0a2/lib/dns/dynamic_db.c ---- /dev/null 2009-09-15 11:43:46.690717252 +0200 -+++ bind-9.7.0a2/lib/dns/dynamic_db.c 2009-09-15 14:35:49.064494786 +0200 +diff -up /dev/null bind-9.7.0a3/lib/dns/dynamic_db.c +--- /dev/null 2009-09-16 12:27:54.710000266 +0200 ++++ bind-9.7.0a3/lib/dns/dynamic_db.c 2009-09-16 10:47:35.744643926 +0200 @@ -0,0 +1,364 @@ +/* + * Copyright (C) 2008-2009 Red Hat, Inc. @@ -533,9 +533,9 @@ diff -up /dev/null bind-9.7.0a2/lib/dns/dynamic_db.c + + return args->timermgr; +} -diff -up /dev/null bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h ---- /dev/null 2009-09-15 11:43:46.690717252 +0200 -+++ bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h 2009-09-15 14:35:49.064494786 +0200 +diff -up /dev/null bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h +--- /dev/null 2009-09-16 12:27:54.710000266 +0200 ++++ bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h 2009-09-16 10:47:35.744643926 +0200 @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2008-2009 Red Hat, Inc. @@ -587,9 +587,9 @@ diff -up /dev/null bind-9.7.0a2/lib/dns/include/dns/dynamic_db.h +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args); + +#endif -diff -up bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb bind-9.7.0a2/lib/dns/include/dns/log.h ---- bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb 2009-01-18 00:47:43.000000000 +0100 -+++ bind-9.7.0a2/lib/dns/include/dns/log.h 2009-09-15 14:35:49.064494786 +0200 +diff -up bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb bind-9.7.0a3/lib/dns/include/dns/log.h +--- bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb 2009-01-18 00:47:43.000000000 +0100 ++++ bind-9.7.0a3/lib/dns/include/dns/log.h 2009-09-16 10:47:35.744643926 +0200 @@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul #define DNS_LOGMODULE_HINTS (&dns_modules[24]) #define DNS_LOGMODULE_ACACHE (&dns_modules[25]) @@ -598,9 +598,9 @@ diff -up bind-9.7.0a2/lib/dns/include/dns/log.h.dyndb bind-9.7.0a2/lib/dns/inclu ISC_LANG_BEGINDECLS -diff -up bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/include/dns/Makefile.in ---- bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb 2008-11-15 00:47:33.000000000 +0100 -+++ bind-9.7.0a2/lib/dns/include/dns/Makefile.in 2009-09-15 14:35:49.064494786 +0200 +diff -up bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/include/dns/Makefile.in +--- bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb 2008-11-15 00:47:33.000000000 +0100 ++++ bind-9.7.0a3/lib/dns/include/dns/Makefile.in 2009-09-16 10:47:35.744643926 +0200 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h \ @@ -610,10 +610,10 @@ diff -up bind-9.7.0a2/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns 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 \ -diff -up bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb bind-9.7.0a2/lib/dns/include/dns/types.h ---- bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb 2009-07-19 06:18:05.000000000 +0200 -+++ bind-9.7.0a2/lib/dns/include/dns/types.h 2009-09-15 14:35:49.064494786 +0200 -@@ -56,6 +56,7 @@ typedef struct dns_dbtable dns_dbtable +diff -up bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb bind-9.7.0a3/lib/dns/include/dns/types.h +--- bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb 2009-09-01 02:22:27.000000000 +0200 ++++ bind-9.7.0a3/lib/dns/include/dns/types.h 2009-09-16 10:47:35.744643926 +0200 +@@ -60,6 +60,7 @@ typedef struct dns_dbtable dns_dbtable typedef void dns_dbversion_t; typedef struct dns_dlzimplementation dns_dlzimplementation_t; typedef struct dns_dlzdb dns_dlzdb_t; @@ -621,9 +621,9 @@ diff -up bind-9.7.0a2/lib/dns/include/dns/types.h.dyndb bind-9.7.0a2/lib/dns/inc 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.7.0a2/lib/dns/log.c.dyndb bind-9.7.0a2/lib/dns/log.c ---- bind-9.7.0a2/lib/dns/log.c.dyndb 2007-06-19 01:47:40.000000000 +0200 -+++ bind-9.7.0a2/lib/dns/log.c 2009-09-15 14:35:49.064494786 +0200 +diff -up bind-9.7.0a3/lib/dns/log.c.dyndb bind-9.7.0a3/lib/dns/log.c +--- bind-9.7.0a3/lib/dns/log.c.dyndb 2007-06-19 01:47:40.000000000 +0200 ++++ bind-9.7.0a3/lib/dns/log.c 2009-09-16 10:47:35.744643926 +0200 @@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns { "dns/hints", 0 }, { "dns/acache", 0 }, @@ -632,9 +632,9 @@ diff -up bind-9.7.0a2/lib/dns/log.c.dyndb bind-9.7.0a2/lib/dns/log.c { NULL, 0 } }; -diff -up bind-9.7.0a2/lib/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/Makefile.in ---- bind-9.7.0a2/lib/dns/Makefile.in.dyndb 2009-09-15 14:35:49.044494756 +0200 -+++ bind-9.7.0a2/lib/dns/Makefile.in 2009-09-15 14:36:51.104494645 +0200 +diff -up bind-9.7.0a3/lib/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/Makefile.in +--- bind-9.7.0a3/lib/dns/Makefile.in.dyndb 2009-09-16 10:47:35.714664894 +0200 ++++ bind-9.7.0a3/lib/dns/Makefile.in 2009-09-16 10:47:35.744643926 +0200 @@ -57,8 +57,8 @@ DSTOBJS = @DST_EXTRA_OBJS@ \ DNSOBJS = acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \ cache.@O@ callbacks.@O@ compress.@O@ \ @@ -667,9 +667,9 @@ diff -up bind-9.7.0a2/lib/dns/Makefile.in.dyndb bind-9.7.0a2/lib/dns/Makefile.in libdns.@SA@: ${OBJS} ${AR} ${ARFLAGS} $@ ${OBJS} ${RANLIB} $@ -diff -up bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb bind-9.7.0a2/lib/isccfg/namedconf.c ---- bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb 2009-07-29 19:52:00.000000000 +0200 -+++ bind-9.7.0a2/lib/isccfg/namedconf.c 2009-09-15 14:37:13.096994453 +0200 +diff -up bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb bind-9.7.0a3/lib/isccfg/namedconf.c +--- bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb 2009-09-02 18:10:03.000000000 +0200 ++++ bind-9.7.0a3/lib/isccfg/namedconf.c 2009-09-16 10:52:11.257143715 +0200 @@ -87,6 +87,7 @@ static cfg_type_t cfg_type_controls; static cfg_type_t cfg_type_controls_sockaddr; static cfg_type_t cfg_type_destinationlist; @@ -678,15 +678,15 @@ diff -up bind-9.7.0a2/lib/isccfg/namedconf.c.dyndb bind-9.7.0a2/lib/isccfg/named static cfg_type_t cfg_type_ixfrdifftype; static cfg_type_t cfg_type_key; static cfg_type_t cfg_type_logfile; -@@ -760,6 +761,7 @@ namedconf_or_view_clauses[] = { +@@ -791,6 +792,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 }, + { "dynamic-db", &cfg_type_dynamic_db, CFG_CLAUSEFLAG_MULTI }, { "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI }, { "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI }, - { "managed-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI }, -@@ -1531,6 +1533,40 @@ static cfg_type_t cfg_type_dialuptype = + { "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI }, +@@ -1561,6 +1563,40 @@ static cfg_type_t cfg_type_dialuptype = &cfg_rep_string, dialup_enums }; |