X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=5fc4a8229edbe60332818846ce13bd59872c82fe;hb=ac4ddd86d7ab877a0efb325169555c2ef91e4b08;hp=6a2a8419ade4ca51715a2b82e8b733f7b8b8ee9e;hpb=b0e09b785290a8ae614ebc298742a077616abde2;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 6a2a8419..5fc4a822 100644
--- 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;
@@ -61,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
 
@@ -107,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
@@ -120,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