aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/adhoc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-22 01:31:52 +0200
committerKim Alvefur <zash@zash.se>2015-09-22 01:31:52 +0200
commit26574b47a73b824bc0bb1ac28f47de379ac2c64d (patch)
treef6ad57a51df3f189d7ece7f43682e7ccd147537c /plugins/adhoc
parent4c2ff994e81dc411ccaf3288cdd3f5c67a80d035 (diff)
parent4e24283711de37e3db92ebe0f93e26c55d516eda (diff)
downloadprosody-26574b47a73b824bc0bb1ac28f47de379ac2c64d.tar.gz
prosody-26574b47a73b824bc0bb1ac28f47de379ac2c64d.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc')
-rw-r--r--plugins/adhoc/mod_adhoc.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/adhoc/mod_adhoc.lua b/plugins/adhoc/mod_adhoc.lua
index f3e7f520..1c956021 100644
--- a/plugins/adhoc/mod_adhoc.lua
+++ b/plugins/adhoc/mod_adhoc.lua
@@ -34,7 +34,8 @@ module:hook("host-disco-info-node", function (event)
reply:tag("feature", { var = "jabber:x:data" }):up();
event.exists = true;
else
- return origin.send(st.error_reply(stanza, "auth", "forbidden", "This item is not available to you"));
+ origin.send(st.error_reply(stanza, "auth", "forbidden", "This item is not available to you"));
+ return true;
end
elseif node == xmlns_cmd then
reply:tag("identity", { name = "Ad-Hoc Commands",
@@ -87,7 +88,8 @@ module:hook("iq/host/"..xmlns_cmd..":command", function (event)
return true
end
-- User has permission now execute the command
- return adhoc_handle_cmd(commands[node], origin, stanza);
+ adhoc_handle_cmd(commands[node], origin, stanza);
+ return true;
end
end
end, 500);