community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better handle recursive includes

This commit is contained in:
Miek Gieben 2012-01-21 23:42:33 +01:00
parent 2718f6f23a
commit 01cb137157
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
zscan.go
View File

@ -117,6 +117,9 @@ func parseZone(r io.Reader, f string, t chan Token, include int) {
close(t)
}
}()
if include > 7 {
t <- Token{Error: &ParseError{f, "Too deeply nested $INCLUDE", l}}
}
var s scanner.Scanner
c := make(chan lex)
s.Init(r)
@ -187,16 +190,13 @@ func parseZone(r io.Reader, f string, t chan Token, include int) {
return
}
// Start with the new file
r1, e1 := os.Open(l.token)
if e1 != nil {
t <- Token{Error: &ParseError{f, "Failed to open `" + l.token + "'", l}}
return
}
if include+1 > 8 {
t <- Token{Error: &ParseError{f, "Too deeply nested $INCLUDE", l}}
}
parseZone(r1, l.token, t, include+1)
st = _EXPECT_OWNER_DIR
r1, e1 := os.Open(l.token)
if e1 != nil {
t <- Token{Error: &ParseError{f, "Failed to open `" + l.token + "'", l}}
return
}
parseZone(r1, l.token, t, include+1)
st = _EXPECT_OWNER_DIR
case _EXPECT_DIRTTL_BL:
if l.value != _BLANK {
t <- Token{Error: &ParseError{f, "No blank after $TTL-directive", l}}
@ -381,14 +381,14 @@ func zlexer(s scanner.Scanner, c chan lex) {
l.value = _OWNER
l.token = str
// escape $... start with a \ not a $, so this will work
switch str {
case "$TTL":
switch str {
case "$TTL":
l.value = _DIRTTL
case "$ORIGIN":
case "$ORIGIN":
l.value = _DIRORIGIN
case "$INCLUDE":
case "$INCLUDE":
l.value = _DIRINCLUDE
}
}
c <- l
} else {
l.value = _STRING