aboutsummaryrefslogtreecommitdiffstats
path: root/core/sessionmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-03-23 02:33:15 +0100
committerKim Alvefur <zash@zash.se>2013-03-23 02:33:15 +0100
commit75e786c1f0ca40d9244324f30d9ef662e7e24974 (patch)
treeecc07df37df1db9a79a86f936ed683a9654861f4 /core/sessionmanager.lua
parent0019ee9380c3129056cd4521018a888b69068ca0 (diff)
downloadprosody-75e786c1f0ca40d9244324f30d9ef662e7e24974.tar.gz
prosody-75e786c1f0ca40d9244324f30d9ef662e7e24974.zip
core.*: Complete removal of all traces of the "core" section and section-related code.
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r--core/sessionmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 05b2d64b..e721835d 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -140,7 +140,7 @@ function bind_resource(session, resource)
local sessions = hosts[session.host].sessions[session.username].sessions;
if sessions[resource] then
-- Resource conflict
- local policy = config_get(session.host, "core", "conflict_resolve");
+ local policy = config_get(session.host, "conflict_resolve");
local increment;
if policy == "random" then
resource = uuid_generate();