aboutsummaryrefslogtreecommitdiffstats
path: root/main.lua
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2008-11-15 13:47:17 +0100
committerTobias Markmann <tm@ayena.de>2008-11-15 13:47:17 +0100
commitefb34b5c4af68c37a568e61986a0b93535a50814 (patch)
treeba77cb7ad14158323a31bfb9e332c508e94d5b31 /main.lua
parent18e785078a2edf69bf4ec728290a18de2ed28cd7 (diff)
parentaefcb845c34c7bf15a370812b28b5da27fbc983b (diff)
downloadprosody-efb34b5c4af68c37a568e61986a0b93535a50814.tar.gz
prosody-efb34b5c4af68c37a568e61986a0b93535a50814.zip
Merging my new SASL code with Waqas' adjusted saslauth module.
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/main.lua b/main.lua
index eac26fe5..a9154d43 100644
--- a/main.lua
+++ b/main.lua
@@ -17,7 +17,7 @@ hosts = {};
if config.hosts and #config.hosts > 0 then
for _, host in pairs(config.hosts) do
- hosts[host] = {type = "local", connected = true, sessions = {}, host = host};
+ hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
end
else error("No hosts defined in the configuration file"); end
@@ -32,6 +32,9 @@ require "core.usermanager"
require "core.sessionmanager"
require "core.stanza_router"
+pcall(require, "remdebug.engine");
+if remdebug then remdebug.engine.start() end
+
local start = require "net.connlisteners".start;
require "util.stanza"
require "util.jid"