aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-23 23:22:13 +0200
committerKim Alvefur <zash@zash.se>2014-09-23 23:22:13 +0200
commit36cd6e26bd72d1e494c6de5a836568edfd3eda78 (patch)
tree5575c703c5075d720211a69c699a333d03d00064 /plugins/mod_s2s
parent65159ec12ff29eaf2f7f934f6ebb2ecf6a51f30e (diff)
parent6aec6e84256f5411131b740ca16f31f065961fce (diff)
downloadprosody-36cd6e26bd72d1e494c6de5a836568edfd3eda78.tar.gz
prosody-36cd6e26bd72d1e494c6de5a836568edfd3eda78.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 7ff921d9..a50387fb 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -154,6 +154,10 @@ function module.add_host(module)
-- so the stream is ready for stanzas. RFC 6120 Section 4.3
mark_connected(session);
return true;
+ elseif not session.dialback_verifying then
+ session.log("warn", "No SASL EXTERNAL offer and Dialback doesn't seem to be enabled, giving up");
+ session:close();
+ return false;
end
end, -1);
end