Commit c4fa8b75 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] deleted keys not correctly excluded

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

Patch submitted by Nis Wechselberg (enewe@enbewe.de).
parent d4f90b45
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]
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment