aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/mod_s2s.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-03-27 00:27:29 +0100
committerKim Alvefur <zash@zash.se>2015-03-27 00:27:29 +0100
commit603d0df6e2829a8d6dd5d359fd41e09b47469965 (patch)
treebe7cc75b1f7dba7e6b881c22d277c0f79401261f /plugins/mod_s2s/mod_s2s.lua
parent13edf3e093fd656d5110b277eca4c9805f3d925c (diff)
parent51bef3673c57c5a2e323a7eb1424c85498905f53 (diff)
downloadprosody-603d0df6e2829a8d6dd5d359fd41e09b47469965.tar.gz
prosody-603d0df6e2829a8d6dd5d359fd41e09b47469965.zip
Merge 0.9->0.10 again
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
-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