aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_auth_sql.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_auth_sql.erl')
-rw-r--r--src/ejabberd_auth_sql.erl14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/ejabberd_auth_sql.erl b/src/ejabberd_auth_sql.erl
index 0d9665afc..8514b9cf1 100644
--- a/src/ejabberd_auth_sql.erl
+++ b/src/ejabberd_auth_sql.erl
@@ -27,8 +27,6 @@
-compile([{parse_transform, ejabberd_sql_pt}]).
--behaviour(ejabberd_config).
-
-author('alexey@process-one.net').
-behaviour(ejabberd_auth).
@@ -41,7 +39,7 @@
get_vh_registered_users_number/2, get_password/2,
get_password_s/2, is_user_exists/2, remove_user/2,
remove_user/3, store_type/0, plain_password_required/0,
- convert_to_scram/1, opt_type/1]).
+ convert_to_scram/1]).
-include("ejabberd.hrl").
-include("logger.hrl").
@@ -408,9 +406,7 @@ remove_user(User, Server, Password) ->
%%%
is_scrammed() ->
- scram ==
- ejabberd_config:get_option({auth_password_format, ?MYNAME},
- opt_type(auth_password_format), plain).
+ scram == ejabberd_auth:password_format(?MYNAME).
password_to_scram(Password) ->
password_to_scram(Password,
@@ -509,9 +505,3 @@ convert_to_scram(Server) ->
Error -> Error
end
end.
-
-opt_type(auth_password_format) ->
- fun (plain) -> plain;
- (scram) -> scram
- end;
-opt_type(_) -> [auth_password_format].