diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2014-06-03 13:15:13 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2014-06-03 13:15:13 +0100 |
commit | b3b720366e737a8e02560b4b362660cdf35bf6f2 (patch) | |
tree | f26dcd1d54461715f40ed185cdceae2caf546908 | |
parent | f3a1be659ec77f9f2bae29cb669bee65cd538941 (diff) | |
parent | ab5265bd6d1cac4249993c32221c0b027e02f8d1 (diff) | |
download | rabbitmq-server-b3b720366e737a8e02560b4b362660cdf35bf6f2.tar.gz |
Merge bug25550
-rw-r--r-- | src/rabbit_ssl.erl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/rabbit_ssl.erl b/src/rabbit_ssl.erl index e2894896..bd5dcf07 100644 --- a/src/rabbit_ssl.erl +++ b/src/rabbit_ssl.erl @@ -104,15 +104,11 @@ peer_cert_auth_name(common_name, Cert) -> auth_config_sane() -> {ok, Opts} = application:get_env(rabbit, ssl_options), - case {proplists:get_value(fail_if_no_peer_cert, Opts), - proplists:get_value(verify, Opts)} of - {true, verify_peer} -> - true; - {F, V} -> - rabbit_log:warning("SSL certificate authentication disabled, " - "fail_if_no_peer_cert=~p; " - "verify=~p~n", [F, V]), - false + case proplists:get_value(verify, Opts) of + verify_peer -> true; + V -> rabbit_log:warning("SSL certificate authentication " + "disabled, verify=~p~n", [V]), + false end. %%-------------------------------------------------------------------------- |