Commit 8b637a1d authored by Evan Hunt's avatar Evan Hunt
Browse files

Merge branch '882-zone-data-cannot-be-loaded-with-dnssec-coverage' into 'master'

Resolve "Zone data cannot be loaded with dnssec-coverage"

Closes #882

See merge request !1522
parents 918fabb6 57e44efc
Pipeline #11277 passed with stages
in 1 minute
5175. [bug] Fixed a problem with file input in dnssec-keymgr,
dnssec-coverage and dnssec-checkds when using
python3. [GL #882]
5174. [doc] Tidy dnssec-keygen manual. [GL !1557]
 
5173. [bug] Fixed a race in socket code that could occur when
......
......@@ -107,6 +107,8 @@ def check(zone, args):
fp, _ = Popen(cmd, stdout=PIPE).communicate()
for line in fp.splitlines():
if type(line) is not str:
line = line.decode('ascii')
rrlist.append(SECRR(line, args.lookaside))
rrlist = sorted(rrlist, key=lambda rr: (rr.keyid, rr.keyalg, rr.hashalg))
......@@ -128,6 +130,8 @@ def check(zone, args):
fp, _ = Popen(cmd, stdin=PIPE, stdout=PIPE).communicate(intods)
for line in fp.splitlines():
if type(line) is not str:
line = line.decode('ascii')
klist.append(SECRR(line, args.lookaside))
if len(klist) < 1:
......
......@@ -43,6 +43,8 @@ class keyzone:
fp, _ = Popen([czpath, "-o", "-", name, filename],
stdout=PIPE, stderr=PIPE).communicate()
for line in fp.splitlines():
if type(line) is not str:
line = line.decode('ascii')
if re.search('^[:space:]*;', line):
continue
fields = line.split()
......
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