aboutsummaryrefslogtreecommitdiffstats
path: root/net/resolvers
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-07-18 21:57:24 +0200
committerKim Alvefur <zash@zash.se>2021-07-18 21:57:24 +0200
commit360eda6cd3551f5023c7f5c0d5100bf8b6320f69 (patch)
tree0ff60c550cb80a8464701be9e5879e2597b194f6 /net/resolvers
parentfa25e086f490c84f0aaca3bc2ad125f402add6b0 (diff)
downloadprosody-360eda6cd3551f5023c7f5c0d5100bf8b6320f69.tar.gz
prosody-360eda6cd3551f5023c7f5c0d5100bf8b6320f69.zip
Revert 926d53af9a7a: Restore DANE support
Previous commit adds a workaround, so this doesn't mutate global state anymore, only per-connection 'extra' state as originally intended.
Diffstat (limited to 'net/resolvers')
-rw-r--r--net/resolvers/basic.lua9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/resolvers/basic.lua b/net/resolvers/basic.lua
index 3c0e69f5..34f1e1c7 100644
--- a/net/resolvers/basic.lua
+++ b/net/resolvers/basic.lua
@@ -36,14 +36,15 @@ function methods:next(cb)
n = n - 1;
if n > 0 then return; end
self.targets = targets;
- --[[
- -- TODO stash tlsa somewhere per connection
- -- FIXME 'extra' here is not per connection
if self.extra and self.extra.use_dane then
if secure and tlsa[1] then
+ self.extra.tlsa = tlsa;
+ self.extra.dane_hostname = self.hostname;
+ else
+ self.extra.tlsa = nil;
+ self.extra.dane_hostname = nil;
end
end
- --]]
self:next(cb);
end