diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-01 17:21:35 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-01 17:21:35 +0100 |
| commit | 54fe3e635ca324bd3a754ee4bbe981081036b447 (patch) | |
| tree | faae2ade844bd3a983da641d39adbd8cb50e217a /src | |
| parent | a2dcea39b65139d398f510cafd95764134ed2565 (diff) | |
| parent | a4c6249acdbc7d1df11789fd2cb6dc71c1173929 (diff) | |
| download | rabbitmq-server-git-54fe3e635ca324bd3a754ee4bbe981081036b447.tar.gz | |
merge bug23107 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_networking.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index f656e04cba..08272afed4 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -107,7 +107,15 @@ boot_ssl() -> ok; {ok, SslListeners} -> ok = rabbit_misc:start_applications([crypto, public_key, ssl]), - {ok, SslOpts} = application:get_env(ssl_options), + {ok, SslOptsConfig} = application:get_env(ssl_options), + SslOpts = + case proplists:get_value(verify, SslOptsConfig, verify_none) of + verify_none -> SslOptsConfig; + verify_peer -> [{verify_fun, fun([]) -> true; + ([_|_]) -> false + end} + | SslOptsConfig] + end, [start_ssl_listener(Host, Port, SslOpts) || {Host, Port} <- SslListeners], ok end. |