mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-12 21:52:07 +02:00
Get rid of ?FUNCTION_NAME macro (it's OTP19+ feature)
This commit is contained in:
parent
61ae0ff02c
commit
8766854870
|
@ -64,27 +64,27 @@ check_password(User, AuthzId, Server, Password) ->
|
||||||
set_password(User, Server, Password) ->
|
set_password(User, Server, Password) ->
|
||||||
case extauth:set_password(User, Server, Password) of
|
case extauth:set_password(User, Server, Password) of
|
||||||
Res when is_boolean(Res) -> ok;
|
Res when is_boolean(Res) -> ok;
|
||||||
{error, Reason} -> failure(User, Server, ?FUNCTION_NAME, Reason)
|
{error, Reason} -> failure(User, Server, set_password, Reason)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
try_register(User, Server, Password) ->
|
try_register(User, Server, Password) ->
|
||||||
case extauth:try_register(User, Server, Password) of
|
case extauth:try_register(User, Server, Password) of
|
||||||
true -> ok;
|
true -> ok;
|
||||||
false -> {error, not_allowed};
|
false -> {error, not_allowed};
|
||||||
{error, Reason} -> failure(User, Server, ?FUNCTION_NAME, Reason)
|
{error, Reason} -> failure(User, Server, try_register, Reason)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
user_exists(User, Server) ->
|
user_exists(User, Server) ->
|
||||||
case extauth:user_exists(User, Server) of
|
case extauth:user_exists(User, Server) of
|
||||||
Res when is_boolean(Res) -> Res;
|
Res when is_boolean(Res) -> Res;
|
||||||
{error, Reason} -> failure(User, Server, ?FUNCTION_NAME, Reason)
|
{error, Reason} -> failure(User, Server, user_exists, Reason)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
remove_user(User, Server) ->
|
remove_user(User, Server) ->
|
||||||
case extauth:remove_user(User, Server) of
|
case extauth:remove_user(User, Server) of
|
||||||
false -> {error, not_allowed};
|
false -> {error, not_allowed};
|
||||||
true -> ok;
|
true -> ok;
|
||||||
{error, Reason} -> failure(User, Server, ?FUNCTION_NAME, Reason)
|
{error, Reason} -> failure(User, Server, remove_user, Reason)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
check_password_extauth(User, _AuthzId, Server, Password) ->
|
check_password_extauth(User, _AuthzId, Server, Password) ->
|
||||||
|
@ -92,7 +92,7 @@ check_password_extauth(User, _AuthzId, Server, Password) ->
|
||||||
case extauth:check_password(User, Server, Password) of
|
case extauth:check_password(User, Server, Password) of
|
||||||
Res when is_boolean(Res) -> Res;
|
Res when is_boolean(Res) -> Res;
|
||||||
{error, Reason} ->
|
{error, Reason} ->
|
||||||
failure(User, Server, ?FUNCTION_NAME, Reason),
|
failure(User, Server, check_password, Reason),
|
||||||
false
|
false
|
||||||
end;
|
end;
|
||||||
true ->
|
true ->
|
||||||
|
|
Loading…
Reference in New Issue
Block a user