diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-08-28 09:56:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-08-28 09:56:12 +0200 |
| commit | 24a141833ad33ff889b07dce83e4f046a9a0a775 (patch) | |
| tree | 3b0c8146f9fb2abfdbb075bbdbc1a375c5f9c6ee /lib/ssl/src/tls_connection.erl | |
| parent | 4676d5218c68654091ac57c4226b75cfd984a355 (diff) | |
| parent | 6fc94ba0b93488e46429dd4e71d11ebfe3b62792 (diff) | |
| download | otp-24a141833ad33ff889b07dce83e4f046a9a0a775.tar.gz otp-24a141833ad33ff889b07dce83e4f046a9a0a775.tar.bz2 otp-24a141833ad33ff889b07dce83e4f046a9a0a775.zip | |
Merge remote-tracking branch 'upstream/maint'
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, |