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

Support comments after $DIRECTIVEs 

Just read until the end of the line after the first string.
This commit is contained in:
Miek Gieben 2012-02-13 19:14:11 +01:00
parent 37ef7bd219
commit fece54374d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zscan.go
View File

@ -197,6 +197,9 @@ func parseZone(r io.Reader, f string, t chan Token, include int) {
t <- Token{Error: &ParseError{f, "Expecting $INCLUDE value, not this...", l}}
return
}
if e:=slurpRemainder(c, f) ; e != nil {
t <- Token{Error: e}
}
// Start with the new file
r1, e1 := os.Open(l.token)
if e1 != nil {
@ -220,6 +223,9 @@ func parseZone(r io.Reader, f string, t chan Token, include int) {
t <- Token{Error: &ParseError{f, "Expecting $TTL value, not this...", l}}
return
}
if e:=slurpRemainder(c, f) ; e != nil {
t <- Token{Error: e}
}
if ttl, ok := stringToTtl(l, f, t); !ok {
return
} else {
@ -237,6 +243,9 @@ func parseZone(r io.Reader, f string, t chan Token, include int) {
t <- Token{Error: &ParseError{f, "Expecting $ORIGIN value, not this...", l}}
return
}
if e:=slurpRemainder(c, f) ; e != nil {
t <- Token{Error: e}
}
if !IsFqdn(l.token) {
origin = l.token + "." + origin // Append old origin if the new one isn't a fqdn
} else {