aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-05-08 12:06:58 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-05-08 12:06:58 +0300
commit87668548708493a7cd7b9dc0606fb73af5fbccf9 (patch)
treee0dd78cb7cb61f124104c6cba2cf7f25ea968bd1
parentImprove logging of external authentication failures (diff)
Get rid of ?FUNCTION_NAME macro (it's OTP19+ feature)
-rw-r--r--src/ejabberd_auth_external.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ejabberd_auth_external.erl b/src/ejabberd_auth_external.erl
index ec30870db..03df71bb8 100644
--- a/src/ejabberd_auth_external.erl
+++ b/src/ejabberd_auth_external.erl
@@ -64,27 +64,27 @@ check_password(User, AuthzId, Server, Password) ->
set_password(User, Server, Password) ->
case extauth:set_password(User, Server, Password) of
Res when is_boolean(Res) -> ok;
- {error, Reason} -> failure(User, Server, ?FUNCTION_NAME, Reason)
+ {error, Reason} -> failure(User, Server, set_password, Reason)
end.
try_register(User, Server, Password) ->
case extauth:try_register(User, Server, Password) of
true -> ok;
false -> {error, not_allowed};
- {error, Reason} -> failure(User, Server, ?FUNCTION_NAME, Reason)
+ {error, Reason} -> failure(User, Server, try_register, Reason)
end.
user_exists(User, Server) ->
case extauth:user_exists(User, Server) of
Res when is_boolean(Res) -> Res;
- {error, Reason} -> failure(User, Server, ?FUNCTION_NAME, Reason)
+ {error, Reason} -> failure(User, Server, user_exists, Reason)
end.
remove_user(User, Server) ->
case extauth:remove_user(User, Server) of
false -> {error, not_allowed};
true -> ok;
- {error, Reason} -> failure(User, Server, ?FUNCTION_NAME, Reason)
+ {error, Reason} -> failure(User, Server, remove_user, Reason)
end.
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
Res when is_boolean(Res) -> Res;
{error, Reason} ->
- failure(User, Server, ?FUNCTION_NAME, Reason),
+ failure(User, Server, check_password, Reason),
false
end;
true ->