From: Tomas Krizek Date: Fri, 15 Feb 2019 13:34:06 +0000 (+0100) Subject: meson: trust_anchors - correctly set manage_ta for keyfile_default X-Git-Tag: v4.0.0~24^2~109 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea1561cb65404f572d4d554552a8a6bf46137dbe;p=thirdparty%2Fknot-resolver.git meson: trust_anchors - correctly set manage_ta for keyfile_default --- diff --git a/daemon/lua/config.lua.in b/daemon/lua/config.lua.in index 95a93224a..1cf00db51 100644 --- a/daemon/lua/config.lua.in +++ b/daemon/lua/config.lua.in @@ -26,7 +26,7 @@ end if not trust_anchors.keysets['\0'] and trust_anchors.keyfile_default then if io.open(trust_anchors.keyfile_default, 'r') then - trust_anchors.config(trust_anchors.keyfile_default, @managed_ta@) + trust_anchors.config(trust_anchors.keyfile_default, @unmanaged@) else panic("cannot open default trust anchor file:'%s'", trust_anchors.keyfile_default diff --git a/daemon/lua/meson.build b/daemon/lua/meson.build index 53808d528..8ea688777 100644 --- a/daemon/lua/meson.build +++ b/daemon/lua/meson.build @@ -7,7 +7,7 @@ config_tests += [ ta_config = configuration_data() ta_config.set('keyfile_default', keyfile_default) ta_config.set('etc_dir', etc_dir) -ta_config.set('managed_ta', managed_ta) +ta_config.set('unmanaged', managed_ta ? 'false' : 'true') trust_anchors = configure_file( input: 'trust_anchors.lua.in',