upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[master] deleted keys not correctly excluded

Browse source 
4415.	[bug]		dnssec-keymgr: Expired/deleted keys were not always
			excluded. [RT #42884]

Patch submitted by Nis Wechselberg (enewe@enbewe.de).
This commit is contained in:
Evan Hunt 2016-07-20 14:28:15 -07:00
parent d4f90b4519
commit c4fa8b75c2
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4415. [bug] dnssec-keymgr: Expired/deleted keys were not always
excluded. [RT #42884]
4414. [bug] Corrected a bug in the MIPS implementation of
isc_atomic_xadd(). [RT #41965]

13
bin/python/isc/keyseries.py.in
View file

@ -31,15 +31,14 @@ class keyseries:
for alg, keys in kdict[zone].items():
for k in keys.values():
if k.sep:
self._K[zone][alg].append(k)
if not (k.delete() and k.delete() < now):
self._K[zone][alg].append(k)
else:
self._Z[zone][alg].append(k)
if not (k.delete() and k.delete() < now):
self._Z[zone][alg].append(k)
for group in [self._K[zone][alg], self._Z[zone][alg]]:
group.sort()
for k in group:
if k.delete() and k.delete() < now:
group.remove(k)
self._K[zone][alg].sort()
self._Z[zone][alg].sort()
def __iter__(self):
for zone in self._zones: