aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-12-10 17:43:26 +0100
committerKim Alvefur <zash@zash.se>2019-12-10 17:43:26 +0100
commitffcb8303ccdc3dc6c0cceae7c7a9ba8d2de5aa65 (patch)
treebf09d204957c02df2bb3c2a1166d1c5aff2f9b6a /plugins
parent6890707e43ca5daa277d19b79acb99b7e93f397a (diff)
downloadprosody-ffcb8303ccdc3dc6c0cceae7c7a9ba8d2de5aa65.tar.gz
prosody-ffcb8303ccdc3dc6c0cceae7c7a9ba8d2de5aa65.zip
mod_s2s: Fix name conflict introduced in c7864f970969
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index e5bfbe7c..6912c9a4 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -506,23 +506,23 @@ local function session_close(session, reason, remote_reason, bounce_reason)
end
end
if reason then -- nil == no err, initiated by us, false == initiated by remote
+ local stream_error;
if type(reason) == "string" then -- assume stream error
- reason = st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' });
+ stream_error = st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' });
elseif type(reason) == "table" and not st.is_stanza(reason) then
- local stanza = st.stanza("stream:error"):tag(reason.condition or "undefined-condition", stream_xmlns_attr):up();
+ stream_error = st.stanza("stream:error"):tag(reason.condition or "undefined-condition", stream_xmlns_attr):up();
if reason.text then
- stanza:tag("text", stream_xmlns_attr):text(reason.text):up();
+ stream_error:tag("text", stream_xmlns_attr):text(reason.text):up();
end
if reason.extra then
- stanza:add_child(reason.extra);
+ stream_error:add_child(reason.extra);
end
- reason = stanza;
end
- if st.is_stanza(reason) then
+ if st.is_stanza(stream_error) then
-- to and from are never unknown on outgoing connections
log("debug", "Disconnecting %s->%s[%s], <stream:error> is: %s",
session.from_host or "(unknown host)" or session.ip, session.to_host or "(unknown host)", session.type, reason);
- session.sends2s(reason);
+ session.sends2s(stream_error);
end
end