aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_auth_external.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_auth_external.erl')
-rw-r--r--src/ejabberd_auth_external.erl42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/ejabberd_auth_external.erl b/src/ejabberd_auth_external.erl
index 5897fba5b..ef7c97551 100644
--- a/src/ejabberd_auth_external.erl
+++ b/src/ejabberd_auth_external.erl
@@ -56,7 +56,7 @@ start(Host) ->
"extauth"),
extauth:start(Host, Cmd),
check_cache_last_options(Host),
- ejabberd_auth_internal:start(Host).
+ ejabberd_auth_mnesia:start(Host).
check_cache_last_options(Server) ->
case get_cache_option(Server) of
@@ -94,7 +94,7 @@ check_password(User, AuthzId, Server, Password, _Digest,
set_password(User, Server, Password) ->
case extauth:set_password(User, Server, Password) of
true ->
- set_password_internal(User, Server, Password), ok;
+ set_password_mnesia(User, Server, Password), ok;
_ -> {error, unknown_problem}
end.
@@ -106,20 +106,20 @@ try_register(User, Server, Password) ->
end.
dirty_get_registered_users() ->
- ejabberd_auth_internal:dirty_get_registered_users().
+ ejabberd_auth_mnesia:dirty_get_registered_users().
get_vh_registered_users(Server) ->
- ejabberd_auth_internal:get_vh_registered_users(Server).
+ ejabberd_auth_mnesia:get_vh_registered_users(Server).
get_vh_registered_users(Server, Data) ->
- ejabberd_auth_internal:get_vh_registered_users(Server,
+ ejabberd_auth_mnesia:get_vh_registered_users(Server,
Data).
get_vh_registered_users_number(Server) ->
- ejabberd_auth_internal:get_vh_registered_users_number(Server).
+ ejabberd_auth_mnesia:get_vh_registered_users_number(Server).
get_vh_registered_users_number(Server, Data) ->
- ejabberd_auth_internal:get_vh_registered_users_number(Server,
+ ejabberd_auth_mnesia:get_vh_registered_users_number(Server,
Data).
%% The password can only be returned if cache is enabled, cached info exists and is fresh enough.
@@ -151,7 +151,7 @@ remove_user(User, Server) ->
case get_cache_option(Server) of
false -> false;
{true, _CacheTime} ->
- ejabberd_auth_internal:remove_user(User, Server)
+ ejabberd_auth_mnesia:remove_user(User, Server)
end
end.
@@ -162,7 +162,7 @@ remove_user(User, Server, Password) ->
case get_cache_option(Server) of
false -> false;
{true, _CacheTime} ->
- ejabberd_auth_internal:remove_user(User, Server,
+ ejabberd_auth_mnesia:remove_user(User, Server,
Password)
end
end.
@@ -197,7 +197,7 @@ check_password_cache(User, AuthzId, Server, Password,
CacheTime) ->
case get_last_access(User, Server) of
online ->
- check_password_internal(User, AuthzId, Server, Password);
+ check_password_mnesia(User, AuthzId, Server, Password);
never ->
check_password_external_cache(User, AuthzId, Server, Password);
mod_last_required ->
@@ -210,7 +210,7 @@ check_password_cache(User, AuthzId, Server, Password,
case is_fresh_enough(TimeStamp, CacheTime) of
%% If no need to refresh, check password against Mnesia
true ->
- case check_password_internal(User, AuthzId, Server, Password) of
+ case check_password_mnesia(User, AuthzId, Server, Password) of
%% If password valid in Mnesia, accept it
true -> true;
%% Else (password nonvalid in Mnesia), check in extauth and cache result
@@ -223,13 +223,13 @@ check_password_cache(User, AuthzId, Server, Password,
end
end.
-get_password_internal(User, Server) ->
- ejabberd_auth_internal:get_password(User, Server).
+get_password_mnesia(User, Server) ->
+ ejabberd_auth_mnesia:get_password(User, Server).
-spec get_password_cache(User::binary(), Server::binary(), CacheTime::integer()) -> Password::string() | false.
get_password_cache(User, Server, CacheTime) ->
case get_last_access(User, Server) of
- online -> get_password_internal(User, Server);
+ online -> get_password_mnesia(User, Server);
never -> false;
mod_last_required ->
?ERROR_MSG("extauth is used, extauth_cache is enabled "
@@ -239,7 +239,7 @@ get_password_cache(User, Server, CacheTime) ->
false;
TimeStamp ->
case is_fresh_enough(TimeStamp, CacheTime) of
- true -> get_password_internal(User, Server);
+ true -> get_password_mnesia(User, Server);
false -> false
end
end.
@@ -248,7 +248,7 @@ get_password_cache(User, Server, CacheTime) ->
check_password_external_cache(User, AuthzId, Server, Password) ->
case check_password_extauth(User, AuthzId, Server, Password) of
true ->
- set_password_internal(User, Server, Password), true;
+ set_password_mnesia(User, Server, Password), true;
false -> false
end.
@@ -256,21 +256,21 @@ check_password_external_cache(User, AuthzId, Server, Password) ->
try_register_external_cache(User, Server, Password) ->
case try_register_extauth(User, Server, Password) of
{atomic, ok} = R ->
- set_password_internal(User, Server, Password), R;
+ set_password_mnesia(User, Server, Password), R;
_ -> {error, not_allowed}
end.
%% @spec (User, AuthzId, Server, Password) -> true | false
-check_password_internal(User, AuthzId, Server, Password) ->
- ejabberd_auth_internal:check_password(User, AuthzId, Server,
+check_password_mnesia(User, AuthzId, Server, Password) ->
+ ejabberd_auth_mnesia:check_password(User, AuthzId, Server,
Password).
%% @spec (User, Server, Password) -> ok | {error, invalid_jid}
-set_password_internal(User, Server, Password) ->
+set_password_mnesia(User, Server, Password) ->
%% @spec (TimeLast, CacheTime) -> true | false
%% TimeLast = online | never | integer()
%% CacheTime = integer() | false
- ejabberd_auth_internal:set_password(User, Server,
+ ejabberd_auth_mnesia:set_password(User, Server,
Password).
is_fresh_enough(TimeStampLast, CacheTime) ->