Software / code / prosody
Diff
core/usermanager.lua @ 3116:90a98a6b52ac
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 23 May 2010 23:11:00 +0100 |
| parent | 3065:0b8bd6f6a9c7 |
| parent | 3113:30896751dd43 |
| child | 3159:b01a699ddf64 |
line wrap: on
line diff
--- a/core/usermanager.lua Sat May 22 20:51:01 2010 +0200 +++ b/core/usermanager.lua Sun May 23 23:11:00 2010 +0100 @@ -74,7 +74,8 @@ function provider:user_exists(username) if not(require_provisioning) and is_cyrus(host) then return true; end - return datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials + local account, err = datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials + return (account or err) ~= nil; -- FIXME also check for empty credentials end function provider:create_user(username, password)
