upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-27 12:13:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Special-case zone in-view

Browse source 
It is not really a zone type, so let's not generate "type in-view"
anchor for it.

(cherry picked from commit 261bdc7358)
This commit is contained in:
Petr Špaček 2022-06-30 11:48:16 +02:00
parent e55682f6f7
commit 07cfcf8691
No known key found for this signature in database
GPG key ID: ABD587CDF06581AE
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/arm/_ext/iscconf.py
View file

@ -145,8 +145,11 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
try:
zone_idx = path.index("zone")
zone_type_txt = path[zone_idx + 1]
assert zone_type_txt.startswith("type "), zone_type_txt
zone_types.add(zone_type_txt[len("type ") :])
if zone_type_txt.startswith("type "):
zone_types.add(zone_type_txt[len("type ") :])
else:
assert zone_type_txt == "in-view"
zone_types.add(zone_type_txt)
except (ValueError, IndexError):
nozone_paths.append(path)
condensed_paths = nozone_paths[:]

6
doc/arm/_ext/mergegrammar.py
View file

@ -22,7 +22,11 @@ import parsegrammar
def read_zone():
zone_grammars = {}
for file in Path("../misc/").glob("*.zoneopt"):
zone_type = f"type {file.stem}"
# in-view is not really a zone type
if file.stem == "in-view":
zone_type = "in-view"
else:
zone_type = f"type {file.stem}"
with file.open(encoding="ascii") as fp:
zonegrammar = parsegrammar.parse_mapbody(fp)