diff options
| author | Erlang/OTP <[email protected]> | 2013-03-18 10:35:15 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-03-18 10:35:15 +0100 |
| commit | 98bad864871eada14c948d27be9998bed36e2f50 (patch) | |
| tree | 23a64a1de4c61da334ebdf5715bd286cc6877081 /lib/orber/src | |
| parent | 2397893ee1e33ffd30205bd1a539d895cf9960b9 (diff) | |
| parent | 9f96e25a0ab80d8860d2b267b64831d766984e68 (diff) | |
| download | otp-98bad864871eada14c948d27be9998bed36e2f50.tar.gz otp-98bad864871eada14c948d27be9998bed36e2f50.tar.bz2 otp-98bad864871eada14c948d27be9998bed36e2f50.zip | |
Merge branch 'lars/orber/corbaloc-bug/OTP-10675' into maint-r15
* lars/orber/corbaloc-bug/OTP-10675:
[orber] Fix bug in corbaloc/corbaname over ssl
Diffstat (limited to 'lib/orber/src')
| -rw-r--r-- | lib/orber/src/orber_env.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/orber/src/orber_env.erl b/lib/orber/src/orber_env.erl index 8758450104..67d31018ff 100644 --- a/lib/orber/src/orber_env.erl +++ b/lib/orber/src/orber_env.erl @@ -302,6 +302,7 @@ create_security_info(ssl, Info) -> "SSL IIOP accept timeout.......: ~p~n" "SSL IIOP backlog..............: ~p~n" "SSL IIOP Local Interface......: ~p~n" + "SSL server options............: ~p~n" "SSL server certfile...........: ~p~n" "SSL server verification type..: ~p~n" "SSL server verification depth.: ~p~n" @@ -310,6 +311,7 @@ create_security_info(ssl, Info) -> "SSL server password...........: ~p~n" "SSL server ciphers............: ~p~n" "SSL server cachetimeout.......: ~p~n" + "SSL client options............: ~p~n" "SSL client certfile...........: ~p~n" "SSL client verification type..: ~p~n" "SSL client verification depth.: ~p~n" @@ -323,10 +325,12 @@ create_security_info(ssl, Info) -> iiop_ssl_in_keepalive(), iiop_ssl_out_keepalive(), nat_iiop_ssl_port(), iiop_ssl_accept_timeout(), iiop_ssl_backlog(), iiop_ssl_ip_address_local(), + ssl_server_options(), ssl_server_certfile(), ssl_server_verify(), ssl_server_depth(), ssl_server_cacertfile(), ssl_server_keyfile(), ssl_server_password(), ssl_server_ciphers(), ssl_server_cachetimeout(), + ssl_client_options(), ssl_client_certfile(), ssl_client_verify(), ssl_client_depth(), ssl_client_cacertfile(), ssl_client_keyfile(), ssl_client_password(), |