Diff

core/usermanager.lua @ 3115:4c35ef27d868

Merge 0.7/waqas->0.7/MattJ
author Matthew Wild <mwild1@gmail.com>
date Sun, 23 May 2010 23:05:01 +0100
parent 3113:30896751dd43
child 3116:90a98a6b52ac
line wrap: on
line diff
--- a/core/usermanager.lua	Sun Feb 28 22:58:43 2010 +0100
+++ b/core/usermanager.lua	Sun May 23 23:05:01 2010 +0100
@@ -69,7 +69,8 @@
 
 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)