aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/mod_s2s.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-14 14:20:37 +0100
committerKim Alvefur <zash@zash.se>2016-03-14 14:20:37 +0100
commite591ea6908d04c3732968a039c848c2e19c496aa (patch)
treed4ea3062e7b9fa8bd642485d15f1b745082f621f /plugins/mod_s2s/mod_s2s.lua
parent82dac8270d60875f985797170c981d37405251ee (diff)
parent676efc69a2b46299df9f3d2a6c35588fed2b9cc0 (diff)
downloadprosody-e591ea6908d04c3732968a039c848c2e19c496aa.tar.gz
prosody-e591ea6908d04c3732968a039c848c2e19c496aa.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index c1357bf7..431e712c 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -366,7 +366,7 @@ function stream_callbacks.streamopened(session, attr)
elseif session.direction == "outgoing" then
session.notopen = nil;
if not attr.id then
- log("error", "Stream response did not give us a stream id!");
+ log("error", "Stream response from %s did not give us a stream id!", session.to_host);
session:close({ condition = "undefined-condition", text = "Missing stream ID" });
return;
end