diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-01 16:23:51 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-01 16:23:51 +0000 |
| commit | 57b4378dede143f6d824b4326a64df1c7d509baf (patch) | |
| tree | d67f34aac05f47a036042f0c52636b2e179a6509 | |
| parent | 82ee60ce09e0cf87de79a4e1cc6476408ae54d7f (diff) | |
| parent | bd1934e306403d34aec93682f290fd06c0784348 (diff) | |
| download | prosody-57b4378dede143f6d824b4326a64df1c7d509baf.tar.gz prosody-57b4378dede143f6d824b4326a64df1c7d509baf.zip | |
Merge with 0.7
| -rw-r--r-- | plugins/mod_saslauth.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 0f809bd8..0cae5833 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -36,7 +36,8 @@ local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas'; local new_sasl; if sasl_backend == "cyrus" then - prosody.unlock_globals(); + 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 |