aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-04 15:46:06 +0100
committerKim Alvefur <zash@zash.se>2016-01-04 15:46:06 +0100
commitd4223ff4d9ed20208860f37c1fc2bbcbc97f4e76 (patch)
treeb995cb351ec94e23c43754e17f3fc00d7ec08c4e /net
parentfe0303fe45e4265d0c72c0c55da2dbab90d2c2d3 (diff)
downloadprosody-d4223ff4d9ed20208860f37c1fc2bbcbc97f4e76.tar.gz
prosody-d4223ff4d9ed20208860f37c1fc2bbcbc97f4e76.zip
net.dns: Allow a zone id in resolv.conf (eg like %eth0)
Diffstat (limited to 'net')
-rw-r--r--net/dns.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 9d90c24c..49958ed7 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -600,7 +600,7 @@ function resolver:adddefaultnameservers() -- - - - - adddefaultnameservers
if resolv_conf then
for line in resolv_conf:lines() do
line = line:gsub("#.*$", "")
- :match('^%s*nameserver%s+([%x:%.]*)%s*$');
+ :match('^%s*nameserver%s+([%x:%.]*%%?%S*)%s*$');
if line then
local ip = new_ip(line);
if ip then