Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

ejabberd_auth*: Fix indentation

Browse Source
This commit is contained in:
Holger Weiss 2016-05-24 00:40:25 +02:00
parent 2a9dd548b5
commit a2f0e157bc
3 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ejabberd_auth_external.erl
View File

@ -81,9 +81,11 @@ check_password(User, AuthzId, Server, Password) ->
false; false;
true -> true ->
case get_cache_option(Server) of case get_cache_option(Server) of
false -> check_password_extauth(User, AuthzId, Server, Password); false ->
check_password_extauth(User, AuthzId, Server, Password);
{true, CacheTime} -> {true, CacheTime} ->
check_password_cache(User, AuthzId, Server, Password, CacheTime) check_password_cache(User, AuthzId, Server, Password,
CacheTime)
end end
end. end.

3
src/ejabberd_auth_ldap.erl
View File

@ -122,8 +122,7 @@ check_password(User, AuthzId, Server, Password) ->
true -> true ->
if Password == <<"">> -> false; if Password == <<"">> -> false;
true -> true ->
case catch check_password_ldap(User, Server, Password) case catch check_password_ldap(User, Server, Password) of
of
{'EXIT', _} -> false; {'EXIT', _} -> false;
Result -> Result Result -> Result
end end

9
src/ejabberd_auth_mnesia.erl
View File

@ -97,11 +97,9 @@ check_password(User, AuthzId, Server, Password) ->
LServer = jid:nameprep(Server), LServer = jid:nameprep(Server),
US = {LUser, LServer}, US = {LUser, LServer},
case catch mnesia:dirty_read({passwd, US}) of case catch mnesia:dirty_read({passwd, US}) of
[#passwd{password = Password}] [#passwd{password = Password}] when is_binary(Password) ->
when is_binary(Password) ->
Password /= <<"">>; Password /= <<"">>;
[#passwd{password = Scram}] [#passwd{password = Scram}] when is_record(Scram, scram) ->
when is_record(Scram, scram) ->
is_password_scram_valid(Password, Scram); is_password_scram_valid(Password, Scram);
_ -> false _ -> false
end end
@ -124,8 +122,7 @@ check_password(User, AuthzId, Server, Password, Digest,
if DigRes -> true; if DigRes -> true;
true -> (Passwd == Password) and (Password /= <<"">>) true -> (Passwd == Password) and (Password /= <<"">>)
end; end;
[#passwd{password = Scram}] [#passwd{password = Scram}] when is_record(Scram, scram) ->
when is_record(Scram, scram) ->
Passwd = jlib:decode_base64(Scram#scram.storedkey), Passwd = jlib:decode_base64(Scram#scram.storedkey),
DigRes = if Digest /= <<"">> -> DigRes = if Digest /= <<"">> ->
Digest == DigestGen(Passwd); Digest == DigestGen(Passwd);