mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.unbound: Merge luaunbound and prosody defaults in absence of user config (fixes #1763) (thanks rgd)

Browse source 
add_defaults() is supposed to merge 3 tables, the defaults in
luaunbound, the defaults from prosody and any config from the prosody
config file.  In the case where no `unbound={}` has been in the config,
it skips over the merge and returns only the prosody built-in defaults.

This results in libunbound skipping reading resolv.conf and uses its
default behavior of full recursive resolution.

Prior to #1737 there were only two tables, the luaunbound defaults and
the prosody config, where bypassing the merge and returning the former
did the right thing.
This commit is contained in:
Kim Alvefur 2022-06-19 19:49:32 +02:00
parent d5e749bc8a
commit 4f3ba05b4d
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
net/unbound.lua
View file

@ -28,19 +28,16 @@ local parsers = dns_utils.parsers;
local builtin_defaults = { hoststxt = false }
local function add_defaults(conf)
if conf then
for option, default in pairs(builtin_defaults) do
if conf[option] == nil then
conf[option] = default;
end
conf = conf or {};
for option, default in pairs(builtin_defaults) do
if conf[option] == nil then
conf[option] = default;
end
for option, default in pairs(libunbound.config) do
if conf[option] == nil then
conf[option] = default;
end
end
for option, default in pairs(libunbound.config) do
if conf[option] == nil then
conf[option] = default;
end
else
return builtin_defaults;
end
return conf;
end