aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-05-30 21:40:00 +0100
committerMatthew Wild <mwild1@gmail.com>2018-05-30 21:40:00 +0100
commit5e4a7b6ffc7fadd01fd77233a9a4c32d2b373995 (patch)
tree3235994b414943a51a3bd119095af21bc4ad8c51
parent75b7e8f7542e0f84f979048b4210d1c55ef5a470 (diff)
parent41e736bbb5e097bfde3d4b7590614912852cc445 (diff)
downloadprosody-5e4a7b6ffc7fadd01fd77233a9a4c32d2b373995.tar.gz
prosody-5e4a7b6ffc7fadd01fd77233a9a4c32d2b373995.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_disco.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index cd07934f..6d3e7753 100644
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -154,6 +154,7 @@ module:hook("stream-features", function (event)
end);
-- Handle disco requests to user accounts
+if module:get_host_type() ~= "local" then return end -- skip for components
module:hook("iq/bare/http://jabber.org/protocol/disco#info:query", function(event)
local origin, stanza = event.origin, event.stanza;
if stanza.attr.type ~= "get" then return; end