prosody
3d1ca811eee3%3Af56eeff93847
Software / code / prosody
Changeset
4845:f56eeff93847
Merge with backout
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 11 May 2012 01:46:41 +0100 |
| parents | 4843:d91dda67647a (diff) 4844:3d1ca811eee3 (current diff) |
| children | 4846:3bc3498df0a0 |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_dialback.lua Fri May 11 01:46:35 2012 +0100 +++ b/plugins/mod_dialback.lua Fri May 11 01:46:41 2012 +0100 @@ -80,8 +80,10 @@ if not origin.from_host then -- Just used for friendlier logging origin.from_host = nameprep(attr.from); - -- COMPAT: Fix server's chopness by not including from - compat_check = true; + if not origin.from_host then + origin.log("debug", "We need to know where to connect but remote server blindly refuses to tell us and to comply to specs, closing connection."); + origin:close("invalid-from"); + end end if not origin.to_host then -- Just used for friendlier logging
--- a/plugins/muc/muc.lib.lua Fri May 11 01:46:35 2012 +0100 +++ b/plugins/muc/muc.lib.lua Fri May 11 01:46:41 2012 +0100 @@ -744,7 +744,11 @@ local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns; if stanza.name == "iq" then if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" then - origin.send(self:get_disco_info(stanza)); + if stanza.tags[1].attr.node then + origin.send(st.error_reply(stanza, "cancel", "feature-not-implemented")); + else + origin.send(self:get_disco_info(stanza)); + end elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" then origin.send(self:get_disco_items(stanza)); elseif xmlns == "http://jabber.org/protocol/muc#admin" then
