diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-08-28 09:55:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-08-28 09:55:12 +0200 |
| commit | 6fc94ba0b93488e46429dd4e71d11ebfe3b62792 (patch) | |
| tree | 68c0566898f55d3851d19187cb63f17c15126763 /lib/ssl/src/tls_connection.erl | |
| parent | c47bcc2524a47753347bf9b4edd3df43235c58cb (diff) | |
| parent | 8ce2f3f0cae692642dfd68e0d8bde3b039a658c6 (diff) | |
| download | otp-6fc94ba0b93488e46429dd4e71d11ebfe3b62792.tar.gz otp-6fc94ba0b93488e46429dd4e71d11ebfe3b62792.tar.bz2 otp-6fc94ba0b93488e46429dd4e71d11ebfe3b62792.zip | |
Merge branch 'ia/ssl/concurrerr/OTP-11255' into maint
* ia/ssl/concurrerr/OTP-11255:
ssl: Make the ssl manager name for erlang distribution over SSL/TLS relative to the module name of the ssl_manager.
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 159ba406d3..77f49c5d2a 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -1239,9 +1239,9 @@ ssl_init(SslOpts, Role) -> {ok, CertDbRef, CertDbHandle, FileRefHandle, CacheHandle, OwnCert, PrivateKey, DHParams}. init_manager_name(false) -> - put(ssl_manager, ssl_manager); + put(ssl_manager, ssl_manager:manager_name(normal)); init_manager_name(true) -> - put(ssl_manager, ssl_manager_dist). + put(ssl_manager, ssl_manager:manager_name(dist)). init_certificates(#ssl_options{cacerts = CaCerts, cacertfile = CACertFile, |