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 | |
| 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')
| -rw-r--r-- | core/rostermanager.lua | 7 | ||||
| -rw-r--r-- | core/usermanager.lua | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua index a3315245..506cf205 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -96,7 +96,7 @@ function load_roster(username, host) local data, err = datamanager.load(username, host, "roster"); roster = data or {}; if user then user.roster = roster; end - if not roster[false] then roster[false] = { }; end + if not roster[false] then roster[false] = { broken = err or nil }; end if roster[jid] then roster[jid] = nil; log("warn", "roster for "..jid.." has a self-contact"); @@ -125,6 +125,7 @@ function save_roster(username, host, roster) if metadata.version ~= true then metadata.version = (metadata.version or 0) + 1; end + if roster[false].broken then return nil, "Not saving broken roster" end return datamanager.store(username, host, "roster", roster); end log("warn", "save_roster: user had no roster to save"); @@ -190,9 +191,9 @@ function process_inbound_unsubscribe(username, host, jid) end function is_contact_subscribed(username, host, jid) - local roster = load_roster(username, host); + local roster, err = load_roster(username, host); local item = roster[jid]; - return item and (item.subscription == "from" or item.subscription == "both"); + return item and (item.subscription == "from" or item.subscription == "both"), err; end function is_contact_pending_in(username, host, jid) 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) |