Supply ssl verify function conditionally

1 files changed, 7 insertions, 8 deletions

diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 4c3b9bbd0c..b6d2c2ccea 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -108,15 +108,14 @@ boot_ssl() ->
         {ok, SslListeners} ->
             ok = rabbit_misc:start_applications([crypto, public_key, ssl]),
             {ok, SslOptsConfig} = application:get_env(ssl_options),
-            VerifyFun =
-              fun([])    -> true;
-                 ([_|_]) ->
+            SslOpts =
                 case proplists:get_value(verify, SslOptsConfig, verify_none) of
-                  verify_none -> true;
-                  verify_peer -> false
-                end
-              end,
-            SslOpts = [{verify_fun, VerifyFun} | SslOptsConfig],
+                    verify_none -> [SslOptsConfig];
+                    verify_peer -> [{verify_fun, fun([])    -> true;
+                                                    ([_|_]) -> false
+                                                 end}
+                                   | SslOptsConfig]
+                end,
             [start_ssl_listener(Host, Port, SslOpts) || {Host, Port} <- SslListeners],
             ok
     end.