diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-23 23:11:00 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-23 23:11:00 +0100 |
| commit | 9e416aeb5f79cf4dc78d93dfac59d98df5d32c33 (patch) | |
| tree | 790cd084f0b10e92a585be2ea76ad68e482deb1e /core/usermanager.lua | |
| parent | 898743c4b44d02694897b2c01d22e6b5f7106773 (diff) | |
| parent | 84b7c3f97831c15d262663f6bc58b552adb11398 (diff) | |
| download | prosody-9e416aeb5f79cf4dc78d93dfac59d98df5d32c33.tar.gz prosody-9e416aeb5f79cf4dc78d93dfac59d98df5d32c33.zip | |
Merge 0.7->trunk
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 4fef936e..07097dc1 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -74,7 +74,8 @@ function new_default_provider(host) 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) |