Merge 0.7->trunk

diff --cc core/usermanager.lua
index 4fef936ee9de5de04c28d49931de8d20de458b2b,698d2f10413676bc28f3779e94b0f5242fe73e78..07097dc1b97a81d11eaee2bc1e1405b234b5a9b0
--- 1/core/usermanager.lua
--- 2/core/usermanager.lua
+++ b/core/usermanager.lua
@@@ -55,56 -34,23 +55,57 @@@ function new_default_provider(host
                else
                        return nil, "Auth failed. Invalid username or password.";
                end
 -  end
 -      -- must do md5
 -      -- make credentials md5
 -      local pwd = credentials.password;
 -      if not pwd then pwd = credentials.md5; else pwd = hashes.md5(pwd, true); end
 -      -- make password md5
 -      if method == "PLAIN" then
 -              password = hashes.md5(password or "", true);
 -      elseif method ~= "DIGEST-MD5" then
 -              return nil, "Unsupported auth method";
        end
 -      -- compare
 -      if password == pwd then
 -              return true;
 -      else
 -              return nil, "Auth failed. Invalid username or password.";
 +
 +      function provider:get_password(username)
 +              if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
 +              return (datamanager.load(username, host, "accounts") or {}).password;
 +      end
 +      
 +      function provider:set_password(username, password)
 +              if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
 +              local account = datamanager.load(username, host, "accounts");
 +              if account then
 +                      account.password = password;
 +                      return datamanager.store(username, host, "accounts", account);
 +              end
 +              return nil, "Account not available.";
 +      end
 +
 +      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)
 +              if not(require_provisioning) and is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end
 +              return datamanager.store(username, host, "accounts", {password = password});
 +      end
 +
 +      function provider:get_supported_methods()
 +              return {["PLAIN"] = true, ["DIGEST-MD5"] = true}; -- TODO this should be taken from the config
        end
 +
 +      function provider:is_admin(jid)
 +              local admins = config.get(host, "core", "admins");
 +              if admins ~= config.get("*", "core", "admins") then
 +                      if type(admins) == "table" then
 +                              jid = jid_bare(jid);
 +                              for _,admin in ipairs(admins) do
 +                                      if admin == jid then return true; end
 +                              end
 +                      elseif admins then
 +                              log("error", "Option 'admins' for host '%s' is not a table", host);
 +                      end
 +              end
 +              return is_admin(jid); -- Test whether it's a global admin instead
 +      end
 +      return provider;
 +end
 +
 +function validate_credentials(host, username, password, method)
 +      return hosts[host].users:test_password(username, password);
  end
  
  function get_password(username, host)