aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-19 17:51:20 +0200
committerKim Alvefur <zash@zash.se>2015-09-19 17:51:20 +0200
commit4c2ff994e81dc411ccaf3288cdd3f5c67a80d035 (patch)
tree47cf9d27ab4a9fef0167cf77f3674b183d9837fc /plugins
parentd00deda2fdc2c024a6f54f5293c8194e46cb9c3b (diff)
parent27ded264411da3caa885ef86a07f72da8376a438 (diff)
downloadprosody-4c2ff994e81dc411ccaf3288cdd3f5c67a80d035.tar.gz
prosody-4c2ff994e81dc411ccaf3288cdd3f5c67a80d035.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_admin_telnet.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 7523ec52..16b16e88 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -830,19 +830,19 @@ function def_env.s2s:close(from, to)
(session.close or s2smanager.destroy_session)(session);
count = count + 1 ;
end
- end
+ end
return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s");
end
function def_env.s2s:closeall(host)
- local count = 0;
+ local count = 0;
local s2s_sessions = module:shared"/*/s2s/sessions";
for _,session in pairs(s2s_sessions) do
if not host or session.from_host == host or session.to_host == host then
session:close();
- count = count + 1;
- end
- end
+ count = count + 1;
+ end
+ end
if count == 0 then return false, "No sessions to close.";
else return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s"); end
end