diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-28 13:23:32 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-28 13:23:32 +0300 |
| commit | 7129aebe7632468de075d9fc3686d6d692e2347f (patch) | |
| tree | f2616fa3bfea965ad3524b20f03b46d652627f5e /src/ejabberd_auth_riak.erl | |
| parent | Bump cache_tab version (diff) | |
Don't re-define validation functions in multiple places
Diffstat (limited to 'src/ejabberd_auth_riak.erl')
| -rw-r--r-- | src/ejabberd_auth_riak.erl | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/ejabberd_auth_riak.erl b/src/ejabberd_auth_riak.erl index 9555fcad..74f0f73c 100644 --- a/src/ejabberd_auth_riak.erl +++ b/src/ejabberd_auth_riak.erl @@ -27,8 +27,6 @@ -compile([{parse_transform, ejabberd_sql_pt}]). --behaviour(ejabberd_config). - -author('alexey@process-one.net'). -behaviour(ejabberd_auth). @@ -42,7 +40,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, export/1, import/2, - plain_password_required/0, opt_type/1]). + plain_password_required/0]). -export([passwd_schema/0]). -include("ejabberd.hrl"). @@ -272,9 +270,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, @@ -320,9 +316,3 @@ export(_Server) -> import(LServer, [LUser, Password, _TimeStamp]) -> Passwd = #passwd{us = {LUser, LServer}, password = Password}, ejabberd_riak:put(Passwd, passwd_schema(), [{'2i', [{<<"host">>, LServer}]}]). - -opt_type(auth_password_format) -> - fun (plain) -> plain; - (scram) -> scram - end; -opt_type(_) -> [auth_password_format]. |