diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-30 19:45:56 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-30 19:45:56 +0100 |
| commit | ef919e14178f9526cc9c10842c8db7359055a680 (patch) | |
| tree | abef044158d144b17b1065483fb643deafa65c26 /core/s2smanager.lua | |
| parent | fedb8443003df7a5f87257f795f64abd05072be8 (diff) | |
| parent | 64a003d115e699b5076af196e2f7cbf3e345a618 (diff) | |
| download | prosody-ef919e14178f9526cc9c10842c8db7359055a680.tar.gz prosody-ef919e14178f9526cc9c10842c8db7359055a680.zip | |
Merge 0.6->0.7
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 053dbbe7..ca87670a 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -68,7 +68,7 @@ local function bounce_sendq(session, reason) 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 @@ function send_to_host(from_host, to_host, data) 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 |