diff options
| author | Kim Alvefur <zash@zash.se> | 2019-11-23 23:12:01 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-11-23 23:12:01 +0100 |
| commit | 72f1544f6d7301d1313c333f1147b27e242063df (patch) | |
| tree | 1a5b57117c8c88f05ebb8b67a0d2848988b7620c /net/resolvers/service.lua | |
| parent | 7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db (diff) | |
| parent | dfa2bdffc083faa597509d7f35125c41f6ffbc9d (diff) | |
| download | prosody-72f1544f6d7301d1313c333f1147b27e242063df.tar.gz prosody-72f1544f6d7301d1313c333f1147b27e242063df.zip | |
Merge 0.11->trunk
Diffstat (limited to 'net/resolvers/service.lua')
| -rw-r--r-- | net/resolvers/service.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/resolvers/service.lua b/net/resolvers/service.lua index 34f14cba..65b086d2 100644 --- a/net/resolvers/service.lua +++ b/net/resolvers/service.lua @@ -1,6 +1,7 @@ local adns = require "net.adns"; local basic = require "net.resolvers.basic"; local idna_to_ascii = require "util.encodings".idna.to_ascii; +local unpack = table.unpack or unpack; -- luacheck: ignore 113 local methods = {}; local resolver_mt = { __index = methods }; @@ -39,7 +40,11 @@ function methods:next(cb) -- Resolve DNS to target list local dns_resolver = adns.resolver(); - dns_resolver:lookup(function (answer) + dns_resolver:lookup(function (answer, err) + if not answer and not err then + -- net.adns returns nil if there are zero records or nxdomain + answer = {}; + end if answer then if #answer == 0 then if self.extra and self.extra.default_port then |