projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.sasl_cyrus: Automatically initialize Cyrus SASL with the first used service...
[prosody.git]
/
core
/
usermanager.lua
diff --git
a/core/usermanager.lua
b/core/usermanager.lua
index 04154cdb2ef5e4576f7cf33730768af2d30353ab..925ac774071489eedae3dfae20bd3547d23f9452 100644
(file)
--- a/
core/usermanager.lua
+++ b/
core/usermanager.lua
@@
-6,10
+6,7
@@
-- COPYING file in the source package for more information.
--
-- COPYING file in the source package for more information.
--
-
-
-require "util.datamanager"
-local datamanager = datamanager;
+local datamanager = require "util.datamanager";
local log = require "util.logger".init("usermanager");
local type = type;
local error = error;
local log = require "util.logger".init("usermanager");
local type = type;
local error = error;
@@
-77,7
+74,7
@@
function is_admin(jid, host)
for _,admin in ipairs(admins) do
if admin == jid then return true; end
end
for _,admin in ipairs(admins) do
if admin == jid then return true; end
end
- else
log("debug", "Option core.admins is not a table"
); end
+ else
if admins then log("warn", "Option 'admins' for host '%s' is not a table", host
); end
return nil;
end
return nil;
end