diff options
| author | Kim Alvefur <zash@zash.se> | 2013-03-23 02:33:15 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-03-23 02:33:15 +0100 |
| commit | 75e786c1f0ca40d9244324f30d9ef662e7e24974 (patch) | |
| tree | ecc07df37df1db9a79a86f936ed683a9654861f4 /core/usermanager.lua | |
| parent | 0019ee9380c3129056cd4521018a888b69068ca0 (diff) | |
| download | prosody-75e786c1f0ca40d9244324f30d9ef662e7e24974.tar.gz prosody-75e786c1f0ca40d9244324f30d9ef662e7e24974.zip | |
core.*: Complete removal of all traces of the "core" section and section-related code.
Diffstat (limited to 'core/usermanager.lua')
| -rw-r--r-- | core/usermanager.lua | 12 |
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 |