Diff

core/usermanager.lua @ 3064:596303990c7c

usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required)
author Matthew Wild <mwild1@gmail.com>
date Thu, 20 May 2010 11:32:24 +0100
parent 2934:060bb8217fea
child 3065:0b8bd6f6a9c7
child 3113:30896751dd43
line wrap: on
line diff
--- a/core/usermanager.lua	Thu May 20 11:13:51 2010 +0100
+++ b/core/usermanager.lua	Thu May 20 11:32:24 2010 +0100
@@ -16,6 +16,8 @@
 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 @@
 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