Software / code / prosody
Changeset
2725:f96394ad5ab7
Merge with 0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Mar 2010 16:23:51 +0000 |
| parents | 2723:2d5ed733f324 (current diff) 2724:3fcf1048a896 (diff) |
| children | 2727:aab12281488f |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua Mon Mar 01 16:04:35 2010 +0000 +++ b/plugins/mod_saslauth.lua Mon Mar 01 16:23:51 2010 +0000 @@ -36,7 +36,8 @@ 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
