aboutsummaryrefslogtreecommitdiffstats
path: root/core/usermanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-03-23 04:17:39 +0100
committerKim Alvefur <zash@zash.se>2013-03-23 04:17:39 +0100
commit983891c9fa8e728aa4680aedc74ec50a0329346e (patch)
treefc52870bbca26966e739b1654dd7ff728fbbd9e0 /core/usermanager.lua
parent4adcfb2d185bb95ec430822c772f091b713faa7a (diff)
parent869da6c240dccfed8c43228ceb989af5faf6c8f1 (diff)
downloadprosody-983891c9fa8e728aa4680aedc74ec50a0329346e.tar.gz
prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.zip
Merge 0.9->trunk
Diffstat (limited to 'core/usermanager.lua')
-rw-r--r--core/usermanager.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua
index 417d7037..08343bee 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -42,8 +42,8 @@ function initialize_host(host)
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;
- if config.get(host, "core", "anonymous_login") then
+ local auth_provider = config.get(host, "authentication") or default_provider;
+ if config.get(host, "anonymous_login") then
log("error", "Deprecated config option 'anonymous_login'. Use authentication = 'anonymous' instead.");
auth_provider = "anonymous";
end -- COMPAT 0.7
@@ -61,8 +61,8 @@ function initialize_host(host)
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 config.get(host, "core", "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7
+ local auth_provider = config.get(host, "authentication") or default_provider;
+ if config.get(host, "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7
if auth_provider ~= "null" then
modulemanager.load(host, "auth_"..auth_provider);
end
@@ -116,8 +116,8 @@ function is_admin(jid, host)
jid = jid_bare(jid);
host = host or "*";
- local host_admins = config.get(host, "core", "admins");
- local global_admins = config.get("*", "core", "admins");
+ local host_admins = config.get(host, "admins");
+ local global_admins = config.get("*", "admins");
if host_admins and host_admins ~= global_admins then
if type(host_admins) == "table" then