Software / code / prosody
Changeset
3463:1644ab13a4ca
mod_saslauth: Get rid of most Cyrus SASL related code (use authentication='cyrus' instead).
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Mon, 23 Aug 2010 16:22:58 +0500 |
| parents | 3462:cf72ef3c9009 |
| children | 3464:72cd7a785014 |
| files | plugins/mod_saslauth.lua |
| diffstat | 1 files changed, 2 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua Mon Aug 23 01:18:52 2010 +0100 +++ b/plugins/mod_saslauth.lua Mon Aug 23 16:22:58 2010 +0500 @@ -26,9 +26,6 @@ -- Cyrus config options local require_provisioning = module:get_option("cyrus_require_provisioning") or false; -local cyrus_service_realm = module:get_option("cyrus_service_realm"); -local cyrus_service_name = module:get_option("cyrus_service_name"); -local cyrus_application_name = module:get_option("cyrus_application_name"); local log = module._log; @@ -36,28 +33,8 @@ local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind'; local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas'; -local new_sasl; -if sasl_backend == "builtin" then - new_sasl = require "util.sasl".new; -elseif 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) - return cyrus_new( - cyrus_service_realm or realm, - cyrus_service_name or "xmpp", - cyrus_application_name or "prosody" - ); - end - else - module:log("error", "Failed to load Cyrus SASL because: %s", cyrus); - error("Failed to load Cyrus SASL"); - end -else +local new_sasl = require "util.sasl".new; +if sasl_backend ~= "builtin" then module:log("error", "Unknown SASL backend: %s", sasl_backend); error("Unknown SASL backend"); end
