aboutsummaryrefslogtreecommitdiffstats
path: root/core/modulemanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-03-25 19:18:32 +0100
committerKim Alvefur <zash@zash.se>2014-03-25 19:18:32 +0100
commitc98c0fb432db6ce9c7bbcd433168aa27b36854b8 (patch)
tree652efec3423f31c2562f4eab50e0bd3d48bf884c /core/modulemanager.lua
parent7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0 (diff)
parent8c0d996be4f47b77a02668474d3d8a0a41bd0f98 (diff)
downloadprosody-c98c0fb432db6ce9c7bbcd433168aa27b36854b8.tar.gz
prosody-c98c0fb432db6ce9c7bbcd433168aa27b36854b8.zip
Merge 0.10->trunk
Diffstat (limited to 'core/modulemanager.lua')
-rw-r--r--core/modulemanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 2e488fd5..eb1ce733 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -30,7 +30,7 @@ pcall = function(f, ...)
end
local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"};
-local component_inheritable_modules = {"tls", "dialback", "iq", "s2s"};
+local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"};
-- We need this to let modules access the real global namespace
local _G = _G;