Merge 0.10->trunk

[prosody.git] / plugins / mod_admin_telnet.lua

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 0b96b68d4aefc32e206d36acdfee722bc1f4389b..55eb2e553a1b766e896a29d466cfb80bf201d3f2 100644 (file)
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -170,6 +170,10 @@ function console_listener.ondisconnect(conn, err)
        end
 end
 
+function console_listener.ondetach(conn)
+       sessions[conn] = nil;
+end
+
 -- Console commands --
 -- These are simple commands, not valid standalone in Lua
 
@@ -1073,12 +1077,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