Mercurial > prosody-hg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 23 Sep 2014 23:22:13 +0200
parents e5945fb5b71f
children 7c8f58d2b331
comparison
equal deleted inserted replaced
6423:1c78f10f05d0 6428:3ee09bfe16e1
152 if session.type == "s2sout" then 152 if session.type == "s2sout" then
153 -- Stream is authenticated and we are seem to be done with feature negotiation, 153 -- Stream is authenticated and we are seem to be done with feature negotiation,
154 -- so the stream is ready for stanzas. RFC 6120 Section 4.3 154 -- so the stream is ready for stanzas. RFC 6120 Section 4.3
155 mark_connected(session); 155 mark_connected(session);
156 return true; 156 return true;
157 elseif not session.dialback_verifying then
158 session.log("warn", "No SASL EXTERNAL offer and Dialback doesn't seem to be enabled, giving up");
159 session:close();
160 return false;
157 end 161 end
158 end, -1); 162 end, -1);
159 end 163 end
160 164
161 -- Stream is authorised, and ready for normal stanzas 165 -- Stream is authorised, and ready for normal stanzas