diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-23 23:05:01 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-23 23:05:01 +0100 |
| commit | 84b7c3f97831c15d262663f6bc58b552adb11398 (patch) | |
| tree | 67f0b2680ad137ebd5cd25ae840d910088fc35e4 /core/usermanager.lua | |
| parent | 4b31a9798fee915ced267f8196af658d74075652 (diff) | |
| parent | c918263d056fa6c099bbc704d8e0a17b24d546d7 (diff) | |
| download | prosody-84b7c3f97831c15d262663f6bc58b552adb11398.tar.gz prosody-84b7c3f97831c15d262663f6bc58b552adb11398.zip | |
Merge 0.7/waqas->0.7/MattJ
Diffstat (limited to 'core/usermanager.lua')
| -rw-r--r-- | core/usermanager.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua index 42e49d38..698d2f10 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -69,7 +69,8 @@ end function user_exists(username, host) 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"); + return (account or err) ~= nil; -- FIXME also check for empty credentials end function create_user(username, password, host) |