diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-15 10:50:39 +0000 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-15 10:50:39 +0000 |
commit | 08c9418c5945071e780a30f1a46e9902c2a44810 (patch) | |
tree | 275ab70b1ce6cdf2b56e25005f5c66ec958e2a05 | |
parent | 62aa0bc41c4c91a020cfbd2d89ddd46587e1b3ef (diff) | |
download | rabbitmq-server-08c9418c5945071e780a30f1a46e9902c2a44810.tar.gz |
Remove the beginning of the per-mechanism options thing, in the interest of getting this thing finished.
-rw-r--r-- | src/rabbit_reader.erl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index cc00aed0..e0939225 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -854,20 +854,13 @@ auth_mechanisms(Sock) -> {ok, Configured} = application:get_env(auth_mechanisms), [Name || {Name, Module} <- rabbit_registry:lookup_all(auth_mechanism), Module:should_offer(Sock), - auth_mechanism_offer(Name, Configured)]. + lists:any(fun (N) -> N == Name end, Configured)]. auth_mechanisms_binary(Sock) -> list_to_binary( string:join( [atom_to_list(A) || A <- auth_mechanisms(Sock)], " ")). -auth_mechanism_offer(Name, Configured) -> - case [Name0 || {Name0, _Opts} <- Configured, - Name == Name0] of - [] -> false; - _ -> true - end. - auth_phase(Response, State = #v1{auth_mechanism = AuthMechanism, auth_state = AuthState, |