aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/usermanager.lua15
-rwxr-xr-xprosodyctl2
2 files changed, 9 insertions, 8 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua
index a9525ea8..6d43dca9 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -20,8 +20,15 @@ local require_provisioning = config.get("*", "core", "cyrus_require_provisioning
local prosody = _G.prosody;
+local setmetatable = setmetatable;
+
module "usermanager"
+function new_null_provider()
+ local function dummy() end;
+ return setmetatable({}, { __index = function() return dummy; end });
+end
+
local function host_handler(host)
local host_session = hosts[host];
host_session.events.add_handler("item-added/auth-provider", function (provider)
@@ -32,15 +39,9 @@ local function host_handler(host)
end);
host_session.events.add_handler("item-removed/auth-provider", function (provider)
if host_session.users == provider then
- userplugins.new_default_provider(host);
+ host_session.users = new_null_provider();
end
end);
- if host_session.users ~= nil then
- log("debug", "using non-default authentication provider");
- else
- log("debug", "using default authentication provider");
- host_session.users = new_default_provider(host); -- Start with the default usermanager provider
- end
end
prosody.events.add_handler("host-activated", host_handler);
prosody.events.add_handler("component-activated", host_handler);
diff --git a/prosodyctl b/prosodyctl
index c0cd89a0..5bdc5187 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -123,7 +123,7 @@ local error_messages = setmetatable({
hosts = prosody.hosts;
local function make_host(hostname)
- return { events = prosody.events, users = require "core.usermanager".new_default_provider(hostname) };
+ return { events = prosody.events, users = require "core.usermanager".new_null_provider(hostname) };
end
for hostname, config in pairs(config.getconfig()) do