aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-25 18:51:49 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-25 18:51:49 +0100
commit5a946f32b47bd41677e8f3f7c8034449a5561796 (patch)
tree5f01ade66f30dcfd6df51b08b2c1f972540ca34c
parent6da5a6f1c0955b5f3031ab075d83393563e92446 (diff)
parentb27ef47ca4af1b2aad018806ddff4cececd163a1 (diff)
downloadprosody-5a946f32b47bd41677e8f3f7c8034449a5561796.tar.gz
prosody-5a946f32b47bd41677e8f3f7c8034449a5561796.zip
Merge with Zash
-rw-r--r--plugins/mod_admin_telnet.lua7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 2ed4ac79..b698d200 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -93,8 +93,7 @@ function console_listener.onincoming(conn, data)
commands["bye"](session, line);
break;
else
- local command = line:lower();
- command = line:match("^%w+") or line:match("%p");
+ local command = line:match("^%w+") or line:match("%p");
if commands[command] then
commands[command](session, line);
break;
@@ -642,7 +641,6 @@ local function print_errors(print, errors)
end
function def_env.s2s:showcert(domain)
- local ser = require "util.serialization".serialize;
local print = self.session.print;
local domain_sessions = set.new(array.collect(keys(incoming_s2s)))
/function(session) return session.from_host == domain and session or nil; end;
@@ -689,7 +687,6 @@ function def_env.s2s:showcert(domain)
end
local domain_certs = array.collect(values(cert_set));
-- Phew. We now have a array of unique certificates presented by domain.
- local print = self.session.print;
local n_certs = #domain_certs;
if n_certs == 0 then
@@ -904,6 +901,8 @@ function def_env.muc:room(room_jid)
return setmetatable({ room = room_obj }, console_room_mt);
end
+local um = require"core.usermanager";
+
def_env.user = {};
function def_env.user:create(jid, password)
local username, host = jid_split(jid);