aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-04-05 15:05:40 +0100
committerMatthew Wild <mwild1@gmail.com>2014-04-05 15:05:40 +0100
commitf3e3081f4f6f759f10b89bfcde9711864acd2d8f (patch)
treeb09836bdc399a225356de8a3f77b90dc77d64d59 /plugins
parent618661cda2a68afbe445ce079c15af25bdaa177b (diff)
downloadprosody-f3e3081f4f6f759f10b89bfcde9711864acd2d8f.tar.gz
prosody-f3e3081f4f6f759f10b89bfcde9711864acd2d8f.zip
mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with a non-existent host
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_admin_telnet.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 2572e982..6f02f030 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -942,6 +942,9 @@ end
function def_env.muc:create(room_jid)
local room, host = check_muc(room_jid);
+ if not room_name then
+ return room_name, host;
+ end
if not room then return nil, host end
if hosts[host].modules.muc.rooms[room_jid] then return nil, "Room exists already" end
return hosts[host].modules.muc.create_room(room_jid);
@@ -949,6 +952,9 @@ end
function def_env.muc:room(room_jid)
local room_name, host = check_muc(room_jid);
+ if not room_name then
+ return room_name, host;
+ end
local room_obj = hosts[host].modules.muc.rooms[room_jid];
if not room_obj then
return nil, "No such room: "..room_jid;