diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-23 23:22:13 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-23 23:22:13 +0200 |
| commit | 733401fde5f11eec5164477a377e94c7aa109cb3 (patch) | |
| tree | 5575c703c5075d720211a69c699a333d03d00064 /plugins/mod_s2s | |
| parent | 19e5326754d02e3a35e14bbbf25ff1c8fed1098d (diff) | |
| parent | 3e8095f15030fc121154423f65d5c7cdd5e049fd (diff) | |
| download | prosody-733401fde5f11eec5164477a377e94c7aa109cb3.tar.gz prosody-733401fde5f11eec5164477a377e94c7aa109cb3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 4 |
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 |