- disable transfer stats on DLZ zones (#454783)
This commit is contained in:
parent
10534b2bf6
commit
6eed956cdf
@ -19,7 +19,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
|
|||||||
Name: bind
|
Name: bind
|
||||||
License: ISC
|
License: ISC
|
||||||
Version: 9.5.1
|
Version: 9.5.1
|
||||||
Release: 0.4.%{PREVER}%{?dist}
|
Release: 0.5.%{PREVER}%{?dist}
|
||||||
Epoch: 32
|
Epoch: 32
|
||||||
Url: http://www.isc.org/products/BIND/
|
Url: http://www.isc.org/products/BIND/
|
||||||
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -60,6 +60,7 @@ Patch87: bind-9.5-parallel-build.patch
|
|||||||
Patch90: bind-9.5-edns.patch
|
Patch90: bind-9.5-edns.patch
|
||||||
Patch91: bind95-rh450995.patch
|
Patch91: bind95-rh450995.patch
|
||||||
Patch92: bind95-rh457175.patch
|
Patch92: bind95-rh457175.patch
|
||||||
|
Patch93: bind95-rh454783.patch
|
||||||
|
|
||||||
# SDB patches
|
# SDB patches
|
||||||
Patch11: bind-9.3.2b2-sdbsrc.patch
|
Patch11: bind-9.3.2b2-sdbsrc.patch
|
||||||
@ -184,6 +185,7 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
|
|||||||
%patch5 -p1 -b .nonexec
|
%patch5 -p1 -b .nonexec
|
||||||
%patch10 -p1 -b .PIE
|
%patch10 -p1 -b .PIE
|
||||||
%patch16 -p1 -b .redhat_doc
|
%patch16 -p1 -b .redhat_doc
|
||||||
|
%patch93 -p1 -b .rh454783
|
||||||
%if %{SDB}
|
%if %{SDB}
|
||||||
mkdir bin/named-sdb
|
mkdir bin/named-sdb
|
||||||
cp -r bin/named/* bin/named-sdb
|
cp -r bin/named/* bin/named-sdb
|
||||||
@ -640,6 +642,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%{_sbindir}/bind-chroot-admin
|
%{_sbindir}/bind-chroot-admin
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 05 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.5.b1
|
||||||
|
- disable transfer stats on DLZ zones (#454783)
|
||||||
|
|
||||||
* Mon Aug 04 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.4.b1
|
* Mon Aug 04 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.4.b1
|
||||||
- add forgotten patch for #457175
|
- add forgotten patch for #457175
|
||||||
- build with -O2
|
- build with -O2
|
||||||
|
50
bind95-rh454783.patch
Normal file
50
bind95-rh454783.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
diff -up bind-9.5.0-P1/bin/named/xfrout.c.rh454783 bind-9.5.0-P1/bin/named-sdb/xfrout.c
|
||||||
|
--- bind-9.5.0-P1/bin/named/xfrout.c.rh454783 2008-08-05 12:50:44.000000000 +0200
|
||||||
|
+++ bind-9.5.0-P1/bin/named/xfrout.c 2008-08-05 12:57:54.000000000 +0200
|
||||||
|
@@ -829,7 +829,9 @@ typedef struct {
|
||||||
|
dns_name_t *qname; /* Question name of request */
|
||||||
|
dns_rdatatype_t qtype; /* dns_rdatatype_{a,i}xfr */
|
||||||
|
dns_rdataclass_t qclass;
|
||||||
|
+#ifndef DLZ
|
||||||
|
dns_zone_t *zone; /* (necessary for stats) */
|
||||||
|
+#endif
|
||||||
|
dns_db_t *db;
|
||||||
|
dns_dbversion_t *ver;
|
||||||
|
isc_quota_t *quota;
|
||||||
|
@@ -1330,10 +1332,14 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_cl
|
||||||
|
xfr->qname = qname;
|
||||||
|
xfr->qtype = qtype;
|
||||||
|
xfr->qclass = qclass;
|
||||||
|
+#ifndef DLZ
|
||||||
|
xfr->zone = NULL;
|
||||||
|
+#endif
|
||||||
|
xfr->db = NULL;
|
||||||
|
xfr->ver = NULL;
|
||||||
|
+#ifndef DLZ
|
||||||
|
dns_zone_attach(zone, &xfr->zone);
|
||||||
|
+#endif
|
||||||
|
dns_db_attach(db, &xfr->db);
|
||||||
|
dns_db_attachversion(db, ver, &xfr->ver);
|
||||||
|
xfr->end_of_stream = ISC_FALSE;
|
||||||
|
@@ -1709,8 +1715,10 @@ xfrout_ctx_destroy(xfrout_ctx_t **xfrp)
|
||||||
|
isc_quota_detach(&xfr->quota);
|
||||||
|
if (xfr->ver != NULL)
|
||||||
|
dns_db_closeversion(xfr->db, &xfr->ver, ISC_FALSE);
|
||||||
|
+#ifndef DLZ
|
||||||
|
if (xfr->zone != NULL)
|
||||||
|
dns_zone_detach(&xfr->zone);
|
||||||
|
+#endif
|
||||||
|
if (xfr->db != NULL)
|
||||||
|
dns_db_detach(&xfr->db);
|
||||||
|
|
||||||
|
@@ -1744,7 +1752,10 @@ xfrout_senddone(isc_task_t *task, isc_ev
|
||||||
|
sendstream(xfr);
|
||||||
|
} else {
|
||||||
|
/* End of zone transfer stream. */
|
||||||
|
+#ifndef DLZ
|
||||||
|
+ /* XXX DLZ zones doesn't support stats */
|
||||||
|
inc_stats(xfr->zone, dns_nsstatscounter_xfrdone);
|
||||||
|
+#endif
|
||||||
|
xfrout_log(xfr, ISC_LOG_INFO, "%s ended", xfr->mnemonic);
|
||||||
|
ns_client_next(xfr->client, ISC_R_SUCCESS);
|
||||||
|
xfrout_ctx_destroy(&xfr);
|
Loading…
Reference in New Issue
Block a user