projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6bb3a29
)
net.dns: Allow a zone id in resolv.conf (eg like %eth0)
author
Kim Alvefur
<zash@zash.se>
Mon, 4 Jan 2016 14:46:06 +0000
(15:46 +0100)
committer
Kim Alvefur
<zash@zash.se>
Mon, 4 Jan 2016 14:46:06 +0000
(15:46 +0100)
net/dns.lua
patch
|
blob
|
history
diff --git
a/net/dns.lua
b/net/dns.lua
index 9d90c24c01da8f9c17de0235d988009046e39311..49958ed785a4ed53f9d3e06b5fb5355397c1708d 100644
(file)
--- 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