aboutsummaryrefslogtreecommitdiffstats
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
commit26afa1e5853c7443b64fe69609c37dc13a30cfec (patch)
treeb995cb351ec94e23c43754e17f3fc00d7ec08c4e
parent5e3000f44c586ec081944e4a131c31b1dbf548da (diff)
downloadprosody-26afa1e5853c7443b64fe69609c37dc13a30cfec.tar.gz
prosody-26afa1e5853c7443b64fe69609c37dc13a30cfec.zip
net.dns: Allow a zone id in resolv.conf (eg like %eth0)
-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