aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-03-27 22:19:44 +0000
committerMatthew Wild <mwild1@gmail.com>2015-03-27 22:19:44 +0000
commit25d886be280a1b6d9965b38cb22aa328354de0c2 (patch)
tree69f565f2bab115b3662d43441fde35e4d05a572f /plugins
parenteaf02c2e7fef247e6ff9c4eeb9fb3dfb1c28e5c1 (diff)
parent9e44974cd3e26de7abfe12fab2ee54b02b5da654 (diff)
downloadprosody-25d886be280a1b6d9965b38cb22aa328354de0c2.tar.gz
prosody-25d886be280a1b6d9965b38cb22aa328354de0c2.zip
Merge with merge merge merge
Diffstat (limited to 'plugins')
-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