- added lost patch for #554316 (occasional crash in keytable.c)
This commit is contained in:
parent
bc36826f0d
commit
b360005238
@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
|
|||||||
Name: bind
|
Name: bind
|
||||||
License: ISC
|
License: ISC
|
||||||
Version: 9.7.0
|
Version: 9.7.0
|
||||||
Release: 8.%{PATCHVER}%{?dist}
|
Release: 9.%{PATCHVER}%{?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 @@ Patch107:bind97-dist-pkcs11.patch
|
|||||||
Patch108:bind97-managed-keyfile.patch
|
Patch108:bind97-managed-keyfile.patch
|
||||||
Patch109:bind97-rh478718.patch
|
Patch109:bind97-rh478718.patch
|
||||||
Patch110:bind97-rh507429.patch
|
Patch110:bind97-rh507429.patch
|
||||||
|
Patch111:bind97-rh554316.patch
|
||||||
|
|
||||||
# SDB patches
|
# SDB patches
|
||||||
Patch11: bind-9.3.2b2-sdbsrc.patch
|
Patch11: bind-9.3.2b2-sdbsrc.patch
|
||||||
@ -243,6 +244,7 @@ mkdir m4
|
|||||||
%patch107 -p1 -b .dist-pkcs11
|
%patch107 -p1 -b .dist-pkcs11
|
||||||
%patch109 -p1 -b .rh478718
|
%patch109 -p1 -b .rh478718
|
||||||
%patch110 -p1 -b .rh507429
|
%patch110 -p1 -b .rh507429
|
||||||
|
%patch111 -p1 -b .rh554316
|
||||||
|
|
||||||
# Sparc and s390 arches need to use -fPIE
|
# Sparc and s390 arches need to use -fPIE
|
||||||
%ifarch sparcv9 sparc64 s390 s390x
|
%ifarch sparcv9 sparc64 s390 s390x
|
||||||
@ -666,6 +668,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 26 2010 Adam Tkac <atkac redhat com> 32:9.7.0-9.P1
|
||||||
|
- added lost patch for #554316 (occasional crash in keytable.c)
|
||||||
|
|
||||||
* Fri Mar 26 2010 Adam Tkac <atkac redhat com> 32:9.7.0-8.P1
|
* Fri Mar 26 2010 Adam Tkac <atkac redhat com> 32:9.7.0-8.P1
|
||||||
- active query might be destroyed in resume_dslookup() which triggered REQUIRE
|
- active query might be destroyed in resume_dslookup() which triggered REQUIRE
|
||||||
failure (#507429)
|
failure (#507429)
|
||||||
|
20
bind97-rh554316.patch
Normal file
20
bind97-rh554316.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
diff -up bind-9.7.0-P1/lib/dns/validator.c.rh554316 bind-9.7.0-P1/lib/dns/validator.c
|
||||||
|
--- bind-9.7.0-P1/lib/dns/validator.c.rh554316 2010-02-25 06:26:27.000000000 +0100
|
||||||
|
+++ bind-9.7.0-P1/lib/dns/validator.c 2010-03-26 15:37:56.113969498 +0100
|
||||||
|
@@ -2211,7 +2211,7 @@ validatezonekey(dns_validator_t *val) {
|
||||||
|
result == ISC_R_SUCCESS;
|
||||||
|
result = dns_rdataset_next(val->event->sigrdataset))
|
||||||
|
{
|
||||||
|
- dns_keynode_t *keynode = NULL, *nextnode = NULL;
|
||||||
|
+ dns_keynode_t *keynode = NULL;
|
||||||
|
|
||||||
|
dns_rdata_reset(&sigrdata);
|
||||||
|
dns_rdataset_current(val->event->sigrdataset,
|
||||||
|
@@ -2231,6 +2231,7 @@ validatezonekey(dns_validator_t *val) {
|
||||||
|
result == ISC_R_SUCCESS)
|
||||||
|
atsep = ISC_TRUE;
|
||||||
|
while (result == ISC_R_SUCCESS) {
|
||||||
|
+ dns_keynode_t *nextnode = NULL;
|
||||||
|
dstkey = dns_keynode_key(keynode);
|
||||||
|
if (dstkey == NULL) {
|
||||||
|
dns_keytable_detachkeynode(
|
Loading…
Reference in New Issue
Block a user