prosody
3ee09bfe16e1
plugins/mod_s2s/mod_s2s.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

plugins/mod_s2s/mod_s2s.lua @ 6428:3ee09bfe16e1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 23 Sep 2014 23:22:13 +0200
parent 6426:e5945fb5b71f
child 6473:7c8f58d2b331
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua	Tue Sep 23 01:44:16 2014 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Tue Sep 23 23:22:13 2014 +0200
@@ -154,6 +154,10 @@
 			-- 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