From 9df44146a6b13f05b978168d1607d80841d8da2c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 20 May 2010 11:32:24 +0100 Subject: usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required) --- core/usermanager.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/usermanager.lua') diff --git a/core/usermanager.lua b/core/usermanager.lua index 8d7270c2..42e49d38 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -16,6 +16,8 @@ local jid_bare = require "util.jid".bare; local config = require "core.configmanager"; local hosts = hosts; +local require_provisioning = config.get("*", "core", "cyrus_require_provisioning") or false; + module "usermanager" local function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end @@ -66,12 +68,12 @@ function set_password(username, host, password) end function user_exists(username, host) - if is_cyrus(host) then return true; end + if not(require_provisioning) and is_cyrus(host) then return true; end return datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials end function create_user(username, password, host) - if is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end + if not(require_provisioning) and is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end return datamanager.store(username, host, "accounts", {password = password}); end -- cgit v1.2.3