diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-08 14:15:49 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-08 14:15:49 +0100 |
| commit | 8be45bd552e7dd18dab7c1d8e2684ccefb5934f1 (patch) | |
| tree | 14faec3470170f6877c03208529756342e59223d /src/rabbit_ssl.erl | |
| parent | 950c75b6ed3fd257524eb35929d2ef2d5b3fb338 (diff) | |
| parent | a88163e4a07fbbdef2010c0308ce7d7ab9dd5c40 (diff) | |
| download | rabbitmq-server-8be45bd552e7dd18dab7c1d8e2684ccefb5934f1.tar.gz | |
merge default into bug22902
Also, flatten the output of rabbit_ssl:format_ssl_subject/1 so that
the info formatting in rabbit_control picks up that it's a string.
Diffstat (limited to 'src/rabbit_ssl.erl')
| -rw-r--r-- | src/rabbit_ssl.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_ssl.erl b/src/rabbit_ssl.erl index 535f9d38..f44dbc3e 100644 --- a/src/rabbit_ssl.erl +++ b/src/rabbit_ssl.erl @@ -123,10 +123,11 @@ extract_ssl_values_list([]) -> %% Convert a proplist to a RFC4514 subject string. format_ssl_subject(RDNs) -> - rabbit_misc:intersperse( - ",", lists:reverse( - [escape_ssl_string(format_ssl_type_and_value(T, V), start) - || {T, V} <- RDNs])). + lists:flatten( + rabbit_misc:intersperse( + ",", lists:reverse( + [escape_ssl_string(format_ssl_type_and_value(T, V), start) + || {T, V} <- RDNs]))). %% Escape a string as per RFC4514. escape_ssl_string([], _) -> |