Software / code / prosody
Diff
core/s2smanager.lua @ 2951:294c359a05f5
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 30 Mar 2010 19:45:56 +0100 |
| parent | 2925:692b3c6c5bd2 |
| parent | 2949:ef19faa7d106 |
| child | 3146:aaaea4cdbf10 |
| child | 3151:6eca858feb04 |
line wrap: on
line diff
--- a/core/s2smanager.lua Thu Mar 25 19:34:41 2010 +0000 +++ b/core/s2smanager.lua Tue Mar 30 19:45:56 2010 +0100 @@ -68,7 +68,7 @@ for i, data in ipairs(sendq) do local reply = data[2]; local xmlns = reply.attr.xmlns; - if not xmlns or xmlns == "jabber:client" or xmlns == "jabber:server" then + if not xmlns then reply.attr.type = "error"; reply:tag("error", {type = "cancel"}) :tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up(); @@ -91,7 +91,7 @@ local host = hosts[from_host].s2sout[to_host]; if host then -- We have a connection to this host already - if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then + if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) then (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host); -- Queue stanza until we are able to send it
