diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 4 | ||||
| -rw-r--r-- | core/componentmanager.lua | 2 | ||||
| -rw-r--r-- | core/loggingmanager.lua | 4 | ||||
| -rw-r--r-- | core/s2smanager.lua | 6 | ||||
| -rw-r--r-- | core/usermanager.lua | 10 | ||||
| -rw-r--r-- | core/xmlhandlers.lua | 4 |
6 files changed, 14 insertions, 16 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index eadddd78..3f7bb348 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -69,8 +69,8 @@ function create_context(host, mode, config) else log("error", "SSL/TLS: Error initialising for host %s: %s", host, err ); end - end - return ctx, err; + end + return ctx, err; end function reload_ssl_config() diff --git a/core/componentmanager.lua b/core/componentmanager.lua index 14d9c06d..6e06ae82 100644 --- a/core/componentmanager.lua +++ b/core/componentmanager.lua @@ -92,7 +92,7 @@ function create_component(host, component, events) ssl_ctx_in = certmanager.create_context(host, "server"); end end - return { type = "component", host = host, connected = true, s2sout = {}, + return { type = "component", host = host, connected = true, s2sout = {}, ssl_ctx = ssl_ctx, ssl_ctx_in = ssl_ctx_in, events = events or events_new(), dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen(), disallow_s2s = configmanager.get(host, "core", "disallow_s2s"); }; diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 96cd32dc..3cd09431 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -10,7 +10,7 @@ local format, rep = string.format, string.rep; local pcall = pcall; local debug = debug; -local tostring, setmetatable, rawset, pairs, ipairs, type = +local tostring, setmetatable, rawset, pairs, ipairs, type = tostring, setmetatable, rawset, pairs, ipairs, type; local io_open, io_write = io.open, io.write; local math_max, rep = math.max, string.rep; @@ -168,7 +168,7 @@ function reload_logging() default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } }; default_file_logging = { - { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } + { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } }; default_timestamp = "%b %d %H:%M:%S"; diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 0ad8f83b..c4a94682 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -16,10 +16,8 @@ local socket = require "socket"; local format = string.format; local t_insert, t_sort = table.insert, table.sort; local get_traceback = debug.traceback; -local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, - setmetatable - = tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, - setmetatable; +local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, setmetatable + = tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, setmetatable; local idna_to_ascii = require "util.encodings".idna.to_ascii; local connlisteners_get = require "net.connlisteners".get; diff --git a/core/usermanager.lua b/core/usermanager.lua index 5fc4a822..153be63e 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -50,11 +50,11 @@ function initialize_host(host) host_session.users = new_null_provider(); 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 auth_provider ~= "null" then - modulemanager.load(host, "auth_"..auth_provider); - 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 auth_provider ~= "null" then + modulemanager.load(host, "auth_"..auth_provider); + end end; prosody.events.add_handler("host-activated", initialize_host, 100); prosody.events.add_handler("component-activated", initialize_host, 100); diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua index b7992f77..182da894 100644 --- a/core/xmlhandlers.lua +++ b/core/xmlhandlers.lua @@ -68,8 +68,8 @@ function init_xmlhandlers(session, stream_callbacks) attr[i] = nil; local ns, nm = k:match(ns_pattern); if nm ~= "" then - ns = ns_prefixes[ns]; - if ns then + ns = ns_prefixes[ns]; + if ns then attr[ns..":"..nm] = attr[k]; attr[k] = nil; end |