aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-03-26 16:49:03 +0000
committerMatthew Wild <mwild1@gmail.com>2015-03-26 16:49:03 +0000
commitf52319aeb3d82d34fdf8699084cdff3460d43c5c (patch)
tree5c9f629f0035697faa311531db3b3d0267e4f1e3 /plugins/mod_s2s
parent829b01aba17e13d75c13679fe6343171378e25d9 (diff)
parent5cc3f03d5aab0516358addd949281c2e3fa70688 (diff)
downloadprosody-f52319aeb3d82d34fdf8699084cdff3460d43c5c.tar.gz
prosody-f52319aeb3d82d34fdf8699084cdff3460d43c5c.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index f9165f20..a58c6421 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -499,6 +499,12 @@ function session_stream_attrs(session, from, to, attr)
if not from or (hosts[from] and hosts[from].modules.dialback) then
attr["xmlns:db"] = 'jabber:server:dialback';
end
+ if not from then
+ attr.from = '';
+ end
+ if not to then
+ attr.to = '';
+ end
end
-- Session initialization logic shared by incoming and outgoing