diff options
| author | Tobias Markmann <tm@ayena.de> | 2010-03-12 18:41:05 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2010-03-12 18:41:05 +0100 |
| commit | b05ccd7b3affed026faf4b492d91af972f5ae8ac (patch) | |
| tree | 9dd7b38690fed8b235977def984797ba62ac50c7 /plugins/mod_saslauth.lua | |
| parent | 3a972b1742c28b7ef9cb5f76ed3bc69f752b5899 (diff) | |
| parent | 456cd9c62a173637f18d2c613e3514919369ad90 (diff) | |
| download | prosody-b05ccd7b3affed026faf4b492d91af972f5ae8ac.tar.gz prosody-b05ccd7b3affed026faf4b492d91af972f5ae8ac.zip | |
Merge with tip.
Diffstat (limited to 'plugins/mod_saslauth.lua')
| -rw-r--r-- | plugins/mod_saslauth.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 0f4c8b4b..0cae5833 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -36,7 +36,10 @@ local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas'; local new_sasl; if sasl_backend == "cyrus" then + prosody.unlock_globals(); --FIXME: Figure out why this is needed and + -- why cyrussasl isn't caught by the sandbox local ok, cyrus = pcall(require, "util.sasl_cyrus"); + prosody.lock_globals(); if ok then local cyrus_new = cyrus.new; new_sasl = function(realm) |