From a4bf01e1ee531da72efe47eeba1d17e0262d0fbb Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Fri, 15 Apr 2016 20:14:04 +0100 Subject: [PATCH] Clean paths --- middleware/file/zone.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleware/file/zone.go b/middleware/file/zone.go index 25d131251..c85ee184b 100644 --- a/middleware/file/zone.go +++ b/middleware/file/zone.go @@ -33,7 +33,7 @@ type Zone struct { // NewZone returns a new zone. func NewZone(name, file string) *Zone { - z := &Zone{origin: dns.Fqdn(name), file: file, Tree: &tree.Tree{}, Expired: new(bool)} + z := &Zone{origin: dns.Fqdn(name), file: path.Clean(file), Tree: &tree.Tree{}, Expired: new(bool)} *z.Expired = false return z } @@ -118,7 +118,7 @@ func (z *Zone) Reload(shutdown chan bool) error { for { select { case event := <-watcher.Events: - if event.Name == z.file { + if path.Clean(event.Name) == z.file { reader, err := os.Open(z.file) if err != nil { log.Printf("[ERROR] Failed to open `%s' for `%s': %v", z.file, z.origin, err)