From 969ea466e40a8e624228cc4631fb03808ac884f3 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 1 Mar 2010 18:37:47 +0500 Subject: util.sasl_cyrus: Ensure the mechanisms table is available after a failed auth attempt. --- util/sasl_cyrus.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua index 57c6ba3c..980af598 100644 --- a/util/sasl_cyrus.lua +++ b/util/sasl_cyrus.lua @@ -87,6 +87,7 @@ end -- select a mechanism to use function method:select(mechanism) self.mechanism = mechanism; + if not self.mechs then self:mechanisms(); end return self.mechs[mechanism]; end -- cgit v1.2.3 From b73fce8d46e187ce41712346b49e6778cca135a9 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 1 Mar 2010 16:02:59 +0000 Subject: mod_saslauth: Unlock globals while loading cyrus --- plugins/mod_saslauth.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 0f4c8b4b..0f809bd8 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -36,7 +36,9 @@ local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas'; local new_sasl; if sasl_backend == "cyrus" then + prosody.unlock_globals(); local ok, cyrus = pcall(require, "util.sasl_cyrus"); + prosody.lock_globals(); if ok then local cyrus_new = cyrus.new; new_sasl = function(realm) -- cgit v1.2.3