From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 5 Mar 2019 07:55:07 +0000 (+0100)
Subject: modules/policy.RPZ: log libzonefile errors as well
X-Git-Tag: v4.0.0~30^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=165e8a88512ff73288e646c41978a1ad19f38337;p=thirdparty%2Fknot-resolver.git

modules/policy.RPZ: log libzonefile errors as well
---

diff --git a/NEWS b/NEWS
index ebeef87b2..f8c216e43 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Bugfixes
 - trust_anchors.add(): include these TAs in .summary() (!753)
 - policy module: support '#' for separating port numbers, for consistency
 - fix startup on macOS+BSD when </dev/null and cqueues installed
+- policy.RPZ: log problems from zone-file level of parser as well (#453)
 
 Improvements
 ------------
diff --git a/modules/policy/policy.lua b/modules/policy/policy.lua
index fb8929868..8498f4926 100644
--- a/modules/policy/policy.lua
+++ b/modules/policy/policy.lua
@@ -362,8 +362,17 @@ local function rpz_parse(action, path)
 		-- Policy triggers @NYI@
 	}
 	local parser = require('zonefile').new()
-	if not parser:open(path) then error(string.format('failed to parse "%s"', path)) end
-	while parser:parse() do
+	local ok, errstr = parser:open(path)
+	if not ok then
+		error(string.format('failed to parse "%s": %s', path, errstr or "unknown error"))
+	end
+	while true do
+		ok, errstr = parser:parse()
+		if errstr then
+			log('[poli] RPZ %s:%d: %s', path, tonumber(parser.line_counter), errstr)
+		end
+		if not ok then break end
+
 		local name = ffi.string(parser.r_owner, parser.r_owner_length)
 		local name_action = ffi.string(parser.r_data, parser.r_data_length)
 		rules[name] = action_map[name_action]