projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usermanager: Return sane errors/results when Cyrus SASL is in use.
[prosody.git]
/
core
/
configmanager.lua
diff --git
a/core/configmanager.lua
b/core/configmanager.lua
index a7c7c4be59d1f0dcd0b75abce87e970619d50b26..e7677df67e63ff2a4a48b2362cfecf3b14fc02c6 100644
(file)
--- a/
core/configmanager.lua
+++ b/
core/configmanager.lua
@@
-1,6
+1,6
@@
-- Prosody IM
-- Prosody IM
--- Copyright (C) 2008-20
09
Matthew Wild
--- Copyright (C) 2008-20
09
Waqas Hussain
+-- Copyright (C) 2008-20
10
Matthew Wild
+-- Copyright (C) 2008-20
10
Waqas Hussain
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
@@
-68,7
+68,7
@@
function load(filename, format)
if parsers[format] and parsers[format].load then
local f, err = io.open(filename);
if parsers[format] and parsers[format].load then
local f, err = io.open(filename);
- if f then
+ if f then
local ok, err = parsers[format].load(f:read("*a"), filename);
f:close();
if ok then
local ok, err = parsers[format].load(f:read("*a"), filename);
f:close();
if ok then
@@
-95,6
+95,15
@@
function addparser(format, parser)
end
end
end
end
+-- _M needed to avoid name clash with local 'parsers'
+function _M.parsers()
+ local p = {};
+ for format in pairs(parsers) do
+ table.insert(p, format);
+ end
+ return p;
+end
+
-- Built-in Lua parser
do
local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
-- Built-in Lua parser
do
local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;