Remove the beginning of the per-mechanism options thing, in the interest of getting this thing finished.

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,