From d74f02e3675af6c98771bf788d64159dbc4d7ef4 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Mon, 5 Sep 2011 15:39:55 +1000 Subject: [PATCH] ejabberd_auth:remove_user/2 always returns ok --- src/ejabberd_auth.erl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl index 1eab9af83..2baa71adc 100644 --- a/src/ejabberd_auth.erl +++ b/src/ejabberd_auth.erl @@ -306,19 +306,16 @@ is_user_exists_in_other_modules_loop([AuthModule|AuthModules], User, Server) -> end. -%% @spec (User, Server) -> ok | error | {error, not_allowed} +%% @spec (User, Server) -> ok %% @doc Remove user. %% Note: it may return ok even if there was some problem removing the user. remove_user(User, Server) -> - R = lists:foreach( + lists:foreach( fun(M) -> M:remove_user(User, Server) end, auth_modules(Server)), - case R of - ok -> ejabberd_hooks:run(remove_user, jlib:nameprep(Server), [User, Server]); - _ -> none - end, - R. + ejabberd_hooks:run(remove_user, jlib:nameprep(Server), [User, Server]), + ok. %% @spec (User, Server, Password) -> ok | not_exists | not_allowed | bad_request | error %% @doc Try to remove user if the provided password is correct.