From 90edd26fd4f7abe9578e4950c610b9004d21bfb8 Mon Sep 17 00:00:00 2001 From: Paul Aurich Date: Sat, 2 Jan 2010 20:03:24 -0800 Subject: mod_saslauth: Add sasl_backend config parameter --- plugins/mod_saslauth.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 92853522..e64eff01 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -26,6 +26,7 @@ local md5 = require "util.hashes".md5; local config = require "core.configmanager"; local secure_auth_only = config.get(module:get_host(), "core", "c2s_require_encryption") or config.get(module:get_host(), "core", "require_encryption"); +local sasl_backend = config.get(module:get_host(), "core", "sasl_backend") or "builtin"; local log = module._log; @@ -34,12 +35,13 @@ local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind'; local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas'; local new_sasl -if config.get(module:get_host(), "core", "cyrus_service_name") then +if sasl_backend == "cyrus" then cyrus_new = require "util.sasl_cyrus".new; new_sasl = function(realm) - return cyrus_new(realm, config.get(module:get_host(), "core", "cyrus_service_name")) + return cyrus_new(realm, config.get(module:get_host(), "core", "cyrus_service_name") or "xmpp") end else + if sasl_backend ~= "backend" then log("warning", "Unknown SASL backend %s", sasl_backend) end; new_sasl = require "util.sasl".new; end -- cgit v1.2.3 From baafc1c47cfcb62a9e452cc9ff20589fd567df50 Mon Sep 17 00:00:00 2001 From: Paul Aurich Date: Sun, 3 Jan 2010 09:51:01 -0800 Subject: mod_saslauth: Use module:get_option() --- plugins/mod_saslauth.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins') diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index e64eff01..283f5e1d 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -25,8 +25,8 @@ local jid_split = require "util.jid".split local md5 = require "util.hashes".md5; local config = require "core.configmanager"; -local secure_auth_only = config.get(module:get_host(), "core", "c2s_require_encryption") or config.get(module:get_host(), "core", "require_encryption"); -local sasl_backend = config.get(module:get_host(), "core", "sasl_backend") or "builtin"; +local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); +local sasl_backend = module:get_option("sasl_backend") or "builtin"; local log = module._log; @@ -38,7 +38,7 @@ local new_sasl if sasl_backend == "cyrus" then cyrus_new = require "util.sasl_cyrus".new; new_sasl = function(realm) - return cyrus_new(realm, config.get(module:get_host(), "core", "cyrus_service_name") or "xmpp") + return cyrus_new(realm, module:get_option("cyrus_service_name") or "xmpp") end else if sasl_backend ~= "backend" then log("warning", "Unknown SASL backend %s", sasl_backend) end; -- cgit v1.2.3