X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=c49bf4288be29ab7ce942b1cafa415249e1e508a;hb=ca491a8ad0830e4dc72be81824eb194170dc0c7c;hp=43e43df9887e06e5cc564d28f95b30fb3e828051;hpb=0f7c4ceed8b3b65787a2ebe6f1ee767fafa8feaf;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 43e43df9..c49bf428 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -6,20 +6,15 @@
 -- COPYING file in the source package for more information.
 --
 
-local datamanager = require "util.datamanager";
 local modulemanager = require "core.modulemanager";
 local log = require "util.logger".init("usermanager");
 local type = type;
-local error = error;
 local ipairs = ipairs;
-local hashes = require "util.hashes";
 local jid_bare = require "util.jid".bare;
 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;
@@ -36,6 +31,8 @@ end
 
 function initialize_host(host)
 	local host_session = hosts[host];
+	if host_session.type ~= "local" then return; end
+	
 	host_session.events.add_handler("item-added/auth-provider", function (event)
 		local provider = event.item;
 		local auth_provider = config.get(host, "core", "authentication") or default_provider;
@@ -52,16 +49,13 @@ 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, host, password)
 	return hosts[host].users.test_password(username, password);
@@ -107,7 +101,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 +114,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