Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Small refactoring 

SVN Revision: 2867
This commit is contained in:
Mickaël Rémond 2010-01-09 15:15:46 +00:00
parent 0bf9832187
commit 24aefc429c
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ejabberd_auth_anonymous.erl
View File

@ -79,7 +79,7 @@ allow_anonymous(Host) ->
%% anonymous protocol can be: sasl_anon|login_anon|both %% anonymous protocol can be: sasl_anon|login_anon|both
is_sasl_anonymous_enabled(Host) -> is_sasl_anonymous_enabled(Host) ->
case allow_anonymous(Host) of case allow_anonymous(Host) of
false -> false; false -> false;
true -> true ->
case anonymous_protocol(Host) of case anonymous_protocol(Host) of
sasl_anon -> true; sasl_anon -> true;
@ -97,7 +97,7 @@ is_login_anonymous_enabled(Host) ->
true -> true ->
case anonymous_protocol(Host) of case anonymous_protocol(Host) of
login_anon -> true; login_anon -> true;
both -> true; both -> true;
_Other -> false _Other -> false
end end
end. end.
@ -115,10 +115,8 @@ anonymous_protocol(Host) ->
%% Return true if multiple connections have been allowed in the config file %% Return true if multiple connections have been allowed in the config file
%% defaults to false %% defaults to false
allow_multiple_connections(Host) -> allow_multiple_connections(Host) ->
case ejabberd_config:get_local_option({allow_multiple_connections, Host}) of ejabberd_config:get_local_option(
true -> true; {allow_multiple_connections, Host}) =:= true.
_Other -> false
end.
%% Check if user exist in the anonymus database %% Check if user exist in the anonymus database
anonymous_user_exist(User, Server) -> anonymous_user_exist(User, Server) ->
@ -176,7 +174,7 @@ check_password(User, Server, Password) ->
check_password(User, Server, _Password, _Digest, _DigestGen) -> check_password(User, Server, _Password, _Digest, _DigestGen) ->
%% We refuse login for registered accounts (They cannot logged but %% We refuse login for registered accounts (They cannot logged but
%% they however are "reserved") %% they however are "reserved")
case ejabberd_auth:is_user_exists_in_other_modules(?MODULE, case ejabberd_auth:is_user_exists_in_other_modules(?MODULE,
User, Server) of User, Server) of
%% If user exists in other module, reject anonnymous authentication %% If user exists in other module, reject anonnymous authentication
true -> false; true -> false;
@ -248,4 +246,3 @@ remove_user(_User, _Server, _Password) ->
plain_password_required() -> plain_password_required() ->
false. false.