aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2015-03-30 12:25:25 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2015-03-30 12:25:25 +0300
commit821039b7d5bde57c7b84e97e91f8ce8b9b4d5088 (patch)
treeea5debb44288daea5bc9d01045735448ddf5a7db
parentThe 'default_db' option should impact ejabberd_auth as well (diff)
Swap 'mnesia' and 'internal' types correctly
-rw-r--r--src/ejabberd_auth.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl
index 4fd127d2b..9985dd3de 100644
--- a/src/ejabberd_auth.erl
+++ b/src/ejabberd_auth.erl
@@ -425,6 +425,10 @@ auth_modules() ->
%% Return the list of authenticated modules for a given host
auth_modules(Server) ->
LServer = jlib:nameprep(Server),
+ Default = case gen_mod:default_db(LServer) of
+ mnesia -> internal;
+ DBType -> DBType
+ end,
Methods = ejabberd_config:get_option(
{auth_method, LServer},
fun(V) when is_list(V) ->
@@ -432,7 +436,7 @@ auth_modules(Server) ->
V;
(V) when is_atom(V) ->
[V]
- end, [gen_mod:default_db(LServer)]),
+ end, [Default]),
[jlib:binary_to_atom(<<"ejabberd_auth_",
(jlib:atom_to_binary(M))/binary>>)
|| M <- Methods].