diff options
author | Kim Alvefur <zash@zash.se> | 2014-03-25 19:18:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-03-25 19:18:32 +0100 |
commit | c98c0fb432db6ce9c7bbcd433168aa27b36854b8 (patch) | |
tree | 652efec3423f31c2562f4eab50e0bd3d48bf884c /plugins | |
parent | 7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0 (diff) | |
parent | 8c0d996be4f47b77a02668474d3d8a0a41bd0f98 (diff) | |
download | prosody-c98c0fb432db6ce9c7bbcd433168aa27b36854b8.tar.gz prosody-c98c0fb432db6ce9c7bbcd433168aa27b36854b8.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mod_saslauth.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 94c060b3..df60aefa 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -197,7 +197,7 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:auth", function(event) return s2s_external_auth(session, stanza) end - if session.type ~= "c2s_unauthed" then return; end + if session.type ~= "c2s_unauthed" or module:get_host_type() ~= "local" then return; end if session.sasl_handler and session.sasl_handler.selected then session.sasl_handler = nil; -- allow starting a new SASL negotiation before completing an old one |