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
commit6c87dbadb1c9f96442f874dd78edd8b85abfb472 (patch)
tree5c9f629f0035697faa311531db3b3d0267e4f1e3 /plugins/mod_s2s
parent0cbc9ecbecd3caf2bab74dd77abab53ca77691f6 (diff)
parenteacc284fd7299addca1a4f1a8332de6eab86480b (diff)
downloadprosody-6c87dbadb1c9f96442f874dd78edd8b85abfb472.tar.gz
prosody-6c87dbadb1c9f96442f874dd78edd8b85abfb472.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