Software /
code /
prosody
Diff
core/usermanager.lua @ 3065:0b8bd6f6a9c7
Merge 0.7->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 20 May 2010 11:44:41 +0100 |
parent | 3053:8bd3857a75ee |
parent | 3064:596303990c7c |
child | 3116:90a98a6b52ac |
line wrap: on
line diff
--- a/core/usermanager.lua Thu May 20 10:48:44 2010 +0100 +++ b/core/usermanager.lua Thu May 20 11:44:41 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; + local prosody = _G.prosody; module "usermanager" @@ -71,12 +73,12 @@ end function provider:user_exists(username) - 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 provider:create_user(username, password) - 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