aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/src/orber_env.erl
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2013-03-21 14:57:34 +0100
committerLars Thorsen <[email protected]>2013-03-21 14:57:34 +0100
commit9e69870e67b06ee1ec83ba8c81de7c7d88bf790f (patch)
tree7a32be1e4cc8de9deaa47ae92b406887c48f791d /lib/orber/src/orber_env.erl
parente173bc1b28453f0edb4863677f3c730b3d7a9f91 (diff)
parent98bad864871eada14c948d27be9998bed36e2f50 (diff)
downloadotp-9e69870e67b06ee1ec83ba8c81de7c7d88bf790f.tar.gz
otp-9e69870e67b06ee1ec83ba8c81de7c7d88bf790f.tar.bz2
otp-9e69870e67b06ee1ec83ba8c81de7c7d88bf790f.zip
Merge branch 'maint-r15' into lars/orber/corbaloc-bug-r16-version/OTP-10675
* maint-r15: [orber] Fix bug in corbaloc/corbaname over ssl
Diffstat (limited to 'lib/orber/src/orber_env.erl')
-rw-r--r--lib/orber/src/orber_env.erl4
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(),