1 files changed, 30 insertions, 25 deletions

diff --git a/lib/orber/src/orber_iiop_pm.erl b/lib/orber/src/orber_iiop_pm.erl
index 927d12b3b2..cf95fe7e4f 100644
--- a/lib/orber/src/orber_iiop_pm.erl
+++ b/lib/orber/src/orber_iiop_pm.erl
@@ -4,16 +4,17 @@
 %% 
 %% Copyright Ericsson AB 1999-2011. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -775,12 +776,11 @@ do_setup_connection(PMPid, Host, Port, SocketType, SocketOptions, Chars,
 
 access_allowed(Host, Port, Type, {_,_,UserInterface}) ->
     Flags = orber:get_flags(),
-    Family = orber_env:ip_version(),
     case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_USE_ACL_OUTGOING) of
 	false when UserInterface == 0 ->
-	    get_local_interface(Type, Family);
+	    get_local_interface(Type);
 	false ->
-	    inet:getaddr(UserInterface, Family);
+	    inet:getaddr(UserInterface, get_ip_family(UserInterface));
 	true ->
 	    SearchFor = 
 		case Type of
@@ -789,43 +789,48 @@ access_allowed(Host, Port, Type, {_,_,UserInterface}) ->
 		    ssl ->
 			ssl_out
 		end,
-	    {ok, Ip} = inet:getaddr(Host, Family),
+	    {ok, Ip} = inet:getaddr(Host, get_ip_family(Host)),
 	    case orber_acl:match(Ip, SearchFor, true) of
 		{true, [], 0} ->
-		    get_local_interface(Type, Family);
+		    get_local_interface(Type);
 		{true, [], Port} ->
-		    get_local_interface(Type, Family);
+		    get_local_interface(Type);
 		{true, [], {Min, Max}} when Port >= Min, Port =< Max ->
-		    get_local_interface(Type, Family);
-		{true, [Interface], 0} ->
-		    {ok, NewIp} = inet:getaddr(Interface, Family),
+		    get_local_interface(Type);
+		{true, [Interface], 0} ->		    
+		    {ok, NewIp} = inet:getaddr(Interface, get_ip_family(Interface)),
 		    {ok, NewIp, {Host, Port, 0}};
 		{true, [Interface], Port} ->
-		    {ok, NewIp} = inet:getaddr(Interface, Family),
+		    
+		    {ok, NewIp} = inet:getaddr(Interface, get_ip_family(Interface)),
 		    {ok, NewIp, {Host, Port, 0}};
 		{true, [Interface], {Min, Max}} when Port >= Min, Port =< Max ->
-		    {ok, NewIp} = inet:getaddr(Interface, Family),
+		    
+		    {ok, NewIp} = inet:getaddr(Interface, get_ip_family(Interface)),
 		    {ok, NewIp, {Host, Port, 0}};
 		_ ->
 		    false
 	    end
     end.
 
-get_local_interface(normal, Family) ->
+get_local_interface(normal) ->
     case orber_env:ip_address_local() of
 	[] ->
 	    ok;
 	[Interface] ->
-	    inet:getaddr(Interface, Family)
+	    inet:getaddr(Interface, get_ip_family(Interface))
     end;
-get_local_interface(ssl, Family) ->
+get_local_interface(ssl) ->
     case orber_env:iiop_ssl_ip_address_local() of
 	[] ->
 	    ok;
 	[Interface] ->
-	    inet:getaddr(Interface, Family)
+	    inet:getaddr(Interface, get_ip_family(Interface))
     end.
 
+get_ip_family(Addr) ->
+    [Family] = orber_socket:get_ip_family_opts(Addr),
+    Family.
 
 invoke_connection_closed(false) ->
     ok;