Merge 0.12->trunk

1 files changed, 10 insertions, 1 deletions

diff --git a/net/unbound.lua b/net/unbound.lua
index 4a6f0241..4d8f9284 100644
--- a/net/unbound.lua
+++ b/net/unbound.lua
@@ -25,13 +25,22 @@ local dns_utils = require"util.dns";
 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 @@ local function lookup(callback, qname, qtype, qclass)
 	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