configmanager: Update Include and RunScript directives to support paths relative...

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 6a2a8419ade4ca51715a2b82e8b733f7b8b8ee9e..83de193f082eb4fed8fc51eef9912a87ba3f492c 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -18,8 +18,6 @@ local config = require "core.configmanager";
 local hosts = hosts;
 local sasl_new = require "util.sasl".new;
 
-local require_provisioning = config.get("*", "core", "cyrus_require_provisioning") or false;
-
 local prosody = _G.prosody;
 
 local setmetatable = setmetatable;
@@ -52,18 +50,15 @@ function initialize_host(host)
                        host_session.users = new_null_provider();
                end
        end);
-       host_session.users = new_null_provider(); -- Start with the default usermanager provider
-       local auth_provider = config.get(host, "core", "authentication") or default_provider;
-       if auth_provider ~= "null" then
-               modulemanager.load(host, "auth_"..auth_provider);
-       end
+       host_session.users = new_null_provider(); -- Start with the default usermanager provider
+       local auth_provider = config.get(host, "core", "authentication") or default_provider;
+       if auth_provider ~= "null" then
+               modulemanager.load(host, "auth_"..auth_provider);
+       end
 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
 
@@ -107,7 +102,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
@@ -120,7 +115,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