aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-03 23:18:56 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-03 23:18:56 +0100
commit31fa05ba49d5f4a9f7355455beb7ef7dc895a181 (patch)
treed6f7206356abb6e1a9e6918fb64c75348048f032 /core
parente0832f54919378d98d7a9f1231efab9193e2c746 (diff)
downloadprosody-31fa05ba49d5f4a9f7355455beb7ef7dc895a181.tar.gz
prosody-31fa05ba49d5f4a9f7355455beb7ef7dc895a181.zip
sessionmanager: Remove max_resources config option and check, incorrect anyway (thanks Zash)
Diffstat (limited to 'core')
-rw-r--r--core/sessionmanager.lua4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index c101bf4e..37c1626a 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -143,10 +143,6 @@ function bind_resource(session, resource)
bare_sessions[session.username..'@'..session.host] = sessions;
else
local sessions = hosts[session.host].sessions[session.username].sessions;
- local limit = config_get(session.host, "core", "max_resources") or 10;
- if #sessions >= limit then
- return nil, "cancel", "resource-constraint", "Resource limit reached; only "..limit.." resources allowed";
- end
if sessions[resource] then
-- Resource conflict
local policy = config_get(session.host, "core", "conflict_resolve");