diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-09-13 08:40:34 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-09-13 08:40:34 +0200 |
| commit | f6e336f7818a04e411a5e20e7d48df89f35e679c (patch) | |
| tree | 5ed5c32b8b3be533b18fb6bd015924cfda930e88 | |
| parent | c1677e8ef83416ad14faf61c61ee13cd3aebb0a4 (diff) | |
| parent | dbd613abcddf8c8ac7b837e1bf57f49070eb8d3a (diff) | |
| download | otp-f6e336f7818a04e411a5e20e7d48df89f35e679c.tar.gz otp-f6e336f7818a04e411a5e20e7d48df89f35e679c.tar.bz2 otp-f6e336f7818a04e411a5e20e7d48df89f35e679c.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_pem_cache.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_pkix_db.erl | 15 |
3 files changed, 13 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index ef7c3de7af..f44fe6a2bf 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -78,7 +78,7 @@ name(normal) -> ?MODULE; name(dist) -> - list_to_atom(atom_to_list(?MODULE) ++ "dist"). + list_to_atom(atom_to_list(?MODULE) ++ "_dist"). %%-------------------------------------------------------------------- -spec start_link(list()) -> {ok, pid()} | ignore | {error, term()}. diff --git a/lib/ssl/src/ssl_pem_cache.erl b/lib/ssl/src/ssl_pem_cache.erl index 6cc0729208..115ab4451d 100644 --- a/lib/ssl/src/ssl_pem_cache.erl +++ b/lib/ssl/src/ssl_pem_cache.erl @@ -65,7 +65,7 @@ name(normal) -> ?MODULE; name(dist) -> - list_to_atom(atom_to_list(?MODULE) ++ "dist"). + list_to_atom(atom_to_list(?MODULE) ++ "_dist"). %%-------------------------------------------------------------------- -spec start_link(list()) -> {ok, pid()} | ignore | {error, term()}. diff --git a/lib/ssl/src/ssl_pkix_db.erl b/lib/ssl/src/ssl_pkix_db.erl index b28636569d..8828c3a0d8 100644 --- a/lib/ssl/src/ssl_pkix_db.erl +++ b/lib/ssl/src/ssl_pkix_db.erl @@ -76,10 +76,17 @@ remove(Dbs) -> true = ets:delete(Db1); (undefined) -> ok; - (ssl_pem_cache) -> - ok; - (ssl_pem_cache_dist) -> - ok; + (Name) when is_atom(Name) -> + NormalName = ssl_pem_cache:name(normal), + DistName = ssl_pem_cache:name(dist), + case Name of + NormalName -> + ok; + DistName -> + ok; + _ -> + true = ets:delete(Name) + end; (Db) -> true = ets:delete(Db) end, Dbs). |