util.events: Event handler indices are now built lazily (faster server startup for...

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 27f1a7df3aab71d241c8821233ac1cc86f53f5e9..5fc4a8229edbe60332818846ce13bd59872c82fe 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -16,8 +16,7 @@ local hashes = require "util.hashes";
 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;
+local sasl_new = require "util.sasl".new;
 
 local prosody = _G.prosody;
 
@@ -29,7 +28,8 @@ module "usermanager"
 
 function new_null_provider()
        local function dummy() end;
-       return setmetatable({name = "null"}, { __index = function() return dummy; end });
+       local function dummy_get_sasl_handler() return sasl_new(nil, {}); end
+       return setmetatable({name = "null", get_sasl_handler = dummy_get_sasl_handler}, { __index = function() return dummy; end });
 end
 
 function initialize_host(host)
@@ -59,9 +59,7 @@ end;
 prosody.events.add_handler("host-activated", initialize_host, 100);
 prosody.events.add_handler("component-activated", initialize_host, 100);
 
-function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
-
-function test_password(username, password, host)
+function test_password(username, host, password)
        return hosts[host].users.test_password(username, password);
 end
 
@@ -105,7 +103,7 @@ function is_admin(jid, host)
                                        break;
                                end
                        end
-               elseif admins then
+               elseif host_admins then
                        log("error", "Option 'admins' for host '%s' is not a list", host);
                end
        end
@@ -118,7 +116,7 @@ function is_admin(jid, host)
                                        break;
                                end
                        end
-               elseif admins then
+               elseif global_admins then
                        log("error", "Global option 'admins' is not a list");
                end
        end