From: Petr Špaček <petr.spacek@nic.cz>
Date: Fri, 21 Dec 2018 08:46:25 +0000 (+0100)
Subject: trust_anchors: unify warning about 0 trust anchors
X-Git-Tag: v3.2.1~3^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a2863f17922c0647295f61ba9113de3c323b753;p=thirdparty%2Fknot-resolver.git

trust_anchors: unify warning about 0 trust anchors
---

diff --git a/daemon/lua/trust_anchors.lua.in b/daemon/lua/trust_anchors.lua.in
index e70649d1e..480b66a69 100644
--- a/daemon/lua/trust_anchors.lua.in
+++ b/daemon/lua/trust_anchors.lua.in
@@ -416,6 +416,10 @@ local function keyset_publish(keyset)
 			end
 		end
 	end
+	if count == 0 then
+		warn('[ ta ] ERROR: no anchors are trusted for ' ..
+		     kres.dname2str(keyset.owner) .. ' !')
+	end
 	return count
 end
 
@@ -470,8 +474,6 @@ update = function (keyset, new_keys, is_initial)
 
 	-- Start using the new TAs.
 	if keyset_publish(keyset) == 0 then
-		warn('[ ta ] WARNING: no anchors for ' .. kres.dname2str(keyset.owner)
-			.. ' are trusted!')
 		-- TODO: try to rebootstrap if for root?
 		return false
 	end
@@ -541,8 +543,7 @@ local add_file = function (path, unmanaged)
 
 	-- Parse new keys, refresh eventually
 	if keyset_publish(keyset) == 0 then
-		warn('[ ta ] ERROR: anchors are trusted for ' .. owner_str .. ' !')
-		-- TODO: try to rebootstrap?
+		-- TODO: try to rebootstrap if for root?
 	end
 	refresh_plan(keyset, 10 * sec, false)
 end