aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-12-14 07:19:58 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-12-14 07:19:58 +0500
commit5f61bd217ce1a516cdb0817e10a8d15966734e0e (patch)
treef995ab70551269634ceccacc7155d923c6bd7ca9 /core
parent06aa3c416e58c67413522dd379f834262ca1b2fd (diff)
downloadprosody-5f61bd217ce1a516cdb0817e10a8d15966734e0e.tar.gz
prosody-5f61bd217ce1a516cdb0817e10a8d15966734e0e.zip
usermanager: Prep admin JIDs (fixes issue#276).
Diffstat (limited to 'core')
-rw-r--r--core/usermanager.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua
index 0152afd7..9e5a016c 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -11,6 +11,7 @@ local log = require "util.logger".init("usermanager");
local type = type;
local ipairs = ipairs;
local jid_bare = require "util.jid".bare;
+local jid_prep = require "util.jid".prep;
local config = require "core.configmanager";
local hosts = hosts;
local sasl_new = require "util.sasl".new;
@@ -97,6 +98,7 @@ end
function is_admin(jid, host)
if host and not hosts[host] then return false; end
+ if type(jid) ~= "string" then return false; end
local is_admin;
jid = jid_bare(jid);
@@ -108,7 +110,7 @@ function is_admin(jid, host)
if host_admins and host_admins ~= global_admins then
if type(host_admins) == "table" then
for _,admin in ipairs(host_admins) do
- if admin == jid then
+ if jid_prep(admin) == jid then
is_admin = true;
break;
end
@@ -121,7 +123,7 @@ function is_admin(jid, host)
if not is_admin and global_admins then
if type(global_admins) == "table" then
for _,admin in ipairs(global_admins) do
- if admin == jid then
+ if jid_prep(admin) == jid then
is_admin = true;
break;
end