mirror of
https://github.com/coredns/coredns.git
synced 2025-11-01 10:43:17 -04:00
Fix zone parser error handling (#6680)
Signed-off-by: Nathan Currier <nathan.currier@broadcom.com>
This commit is contained in:
@@ -66,10 +66,6 @@ func Parse(f io.Reader, origin, fileName string) (*file.Zone, error) {
|
||||
seenSOA := false
|
||||
|
||||
for rr, ok := zp.Next(); ok; rr, ok = zp.Next() {
|
||||
if err := zp.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
switch rr.(type) {
|
||||
case *dns.DNSKEY, *dns.RRSIG, *dns.CDNSKEY, *dns.CDS:
|
||||
continue
|
||||
@@ -88,5 +84,9 @@ func Parse(f io.Reader, origin, fileName string) (*file.Zone, error) {
|
||||
return nil, fmt.Errorf("file %q has no SOA record", fileName)
|
||||
}
|
||||
|
||||
if err := zp.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return z, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user