aboutsummaryrefslogtreecommitdiffstats
path: root/core/usermanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-22 15:24:20 +0100
committerKim Alvefur <zash@zash.se>2016-02-22 15:24:20 +0100
commit82a913c6816be2b0503368afac85b8b20335db0e (patch)
tree3bb6d5bb05f75122414728e4605bbdb9aacacae0 /core/usermanager.lua
parent2675b63e1b14a929277d2ad8bcf6f1ec17187de2 (diff)
parenta1bba9eeab3263061a2b1e1634847b3ed4002e20 (diff)
downloadprosody-82a913c6816be2b0503368afac85b8b20335db0e.tar.gz
prosody-82a913c6816be2b0503368afac85b8b20335db0e.zip
Merge 0.10->trunk
Diffstat (limited to 'core/usermanager.lua')
-rw-r--r--core/usermanager.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua
index 0d8d7f91..d5132662 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -81,6 +81,7 @@ local function set_password(username, password, host)
end
local function user_exists(username, host)
+ if hosts[host].sessions[username] then return true; end
return hosts[host].users.user_exists(username);
end