aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-01-04 09:09:15 +0000
committerMatthew Wild <mwild1@gmail.com>2016-01-04 09:09:15 +0000
commit6a39c2064ccd3956857494208013e95515c3d6fd (patch)
treedee56adb63417f62c3f2ae5a05fa108f05122f73 /plugins
parent6d5bf3651160efa69fb89bd2f92b11f7d69f4034 (diff)
parentdc21fd08f46d714de6f8b8318b3c3ee212e97e2f (diff)
downloadprosody-6a39c2064ccd3956857494208013e95515c3d6fd.tar.gz
prosody-6a39c2064ccd3956857494208013e95515c3d6fd.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_admin_adhoc.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua
index fdbdf462..392e715e 100644
--- a/plugins/mod_admin_adhoc.lua
+++ b/plugins/mod_admin_adhoc.lua
@@ -390,7 +390,7 @@ local function session_flags(session, line)
flags[#flags+1] = "encrypted";
end
if session.compressed then
- flags[#flags+1] = "compressed)";
+ flags[#flags+1] = "compressed";
end
if session.smacks then
flags[#flags+1] = "sm";
@@ -422,7 +422,7 @@ local function list_s2s_this_handler(self, data, state)
local sess_lines = { r = remotehost,
session_flags(session, { "", direction, remotehost or "?" })};
- if remotehost:match(module_host) or localhost:match(module_host) then
+ if localhost == module_host then
s2s_list[#s2s_list+1] = sess_lines;
end
end