priming: enable module by default

Also removed priming query from trust anchor module.
Updated deckard repository.

diff --git a/daemon/lua/sandbox.lua b/daemon/lua/sandbox.lua
index 7124e607b85aade25be43e8665c13fc843f99a32..08be5101750cd66cac66ceb67e61e42e97446035 100644 (file)
--- a/daemon/lua/sandbox.lua
+++ b/daemon/lua/sandbox.lua
@@ -204,6 +204,7 @@ end
 
 -- Load embedded modules
 modules.load('ta_signal_query')
+modules.load('priming')
 
 -- Interactive command evaluation
 function eval_cmd(line, raw)

diff --git a/daemon/lua/trust_anchors.lua.in b/daemon/lua/trust_anchors.lua.in
index e933523ab023b1e482e54fb80678652e0a3cc937..feaad730824a184a225a33cb4bdc59189f253190 100644 (file)
--- a/daemon/lua/trust_anchors.lua.in
+++ b/daemon/lua/trust_anchors.lua.in
@@ -173,7 +173,7 @@ end
 local active_refresh, update -- forwards
 
 -- Plan an event for refreshing the root DNSKEYs and re-scheduling itself
-local function refresh_plan(keyset, delay, priming, is_initial)
+local function refresh_plan(keyset, delay, is_initial)
        local owner_str = kres.dname2str(keyset.owner) -- maybe fix converting back and forth?
        keyset.refresh_ev = event.after(delay, function ()
                resolve(owner_str, kres.type.DNSKEY, kres.class.IN, 'NO_CACHE',
@@ -184,10 +184,6 @@ local function refresh_plan(keyset, delay, priming, is_initial)
                        log('[ ta ] next refresh for ' .. owner_str .. ' in '
                                        .. delay_new/hour .. ' hours')
                        refresh_plan(keyset, delay_new)
-                       -- Priming query, prime root NS next
-                       if priming ~= nil then
-                               resolve(owner_str, kres.type.NS, kres.class.IN)
-                       end
                end)
        end)
 end
@@ -387,7 +383,7 @@ local add_file = function (path, unmanaged)
                local keyset = trust_anchors.keysets['\0']
                keyset.filename = path
                if keyset.refresh_ev then event.cancel(keyset.refresh_ev) end
-               refresh_plan(keyset, 0, true, true)
+               refresh_plan(keyset, 0, true)
                return
        end
        if not unmanaged and path == (trust_anchors.keysets['\0'] or {}).filename then
@@ -421,7 +417,7 @@ local add_file = function (path, unmanaged)
                warn('[ ta ] ERROR: anchors are trusted for ' .. owner_str .. ' !')
                -- TODO: try to rebootstrap?
        end
-       refresh_plan(keyset, 10 * sec, true, false)
+       refresh_plan(keyset, 10 * sec, false)
 end
 
 

diff --git a/tests/deckard b/tests/deckard
index 71498657b9b81311cdf758f48a947239755999de..fcfade5d1805b7c1151523991e4d5ea68db03f03 160000 (submodule)
--- a/tests/deckard
+++ b/tests/deckard
@@ -1 +1 @@
-Subproject commit 71498657b9b81311cdf758f48a947239755999de
+Subproject commit fcfade5d1805b7c1151523991e4d5ea68db03f03