# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1652705518 -7200
# Node ID a24d2b3c19a39eaa85f603384ff3bd3bce0f8215
# Parent  e6cfd0a6f0dad01326b0794f999081a50b1efbee# Parent  cd3b5912c9a348ee6f6a2de7e65535baf20bf30a
Merge 0.12->trunk

diff -r e6cfd0a6f0da -r a24d2b3c19a3 net/unbound.lua
--- a/net/unbound.lua	Mon May 16 11:42:31 2022 +0200
+++ b/net/unbound.lua	Mon May 16 14:51:58 2022 +0200
@@ -25,13 +25,22 @@
 local classes, types, errors = dns_utils.classes, dns_utils.types, dns_utils.errors;
 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
+		end
 		for option, default in pairs(libunbound.config) do
 			if conf[option] == nil then
 				conf[option] = default;
 			end
 		end
+	else
+		return builtin_defaults;
 	end
 	return conf;
 end
@@ -133,7 +142,7 @@
 	if ret then
 		waiting_queries[ret] = callback;
 	else
-		log_query("warn", "Resolver error: %s", err);
+		log_query("error", "Resolver error: %s", err);
 	end
 	return ret, err;
 end