aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-07-25 13:02:46 +0100
committerMatthew Wild <mwild1@gmail.com>2014-07-25 13:02:46 +0100
commit8a4ed9466f3b877d7a6e2c87f1cbec73c4a3c516 (patch)
tree56c01e1263e5c9fb3d1b580179e3bbaf119530b3 /plugins
parentbb40012ca2d5a7eb38d86f4cef5488b31f6da0d0 (diff)
parent999a5a0cb3e13f5922d5c64418162ff463f1abd7 (diff)
downloadprosody-8a4ed9466f3b877d7a6e2c87f1cbec73c4a3c516.tar.gz
prosody-8a4ed9466f3b877d7a6e2c87f1cbec73c4a3c516.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_admin_telnet.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 0b96b68d..d20bcc7b 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1073,12 +1073,12 @@ function def_env.dns:lookup(name, typ, class)
end
function def_env.dns:addnameserver(...)
- dns.addnameserver(...)
+ dns._resolver:addnameserver(...)
return true
end
function def_env.dns:setnameserver(...)
- dns.setnameserver(...)
+ dns._resolver:setnameserver(...)
return true
end