Merge branch 'maint'

2 files changed, 12 insertions, 9 deletions

diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl
index cb72871177..b4cc165d2e 100644
--- a/lib/snmp/src/manager/snmpm_net_if.erl
+++ b/lib/snmp/src/manager/snmpm_net_if.erl
@@ -319,7 +319,7 @@ socket_open(IpPort, SocketOpts) ->
 	    Socket
     end.
 
-socket_params(Domain, {IpAddr, IpPort}, BindTo, CommonSocketOpts) ->
+socket_params(Domain, {IpAddr, IpPort} = Addr, BindTo, CommonSocketOpts) ->
     Family = snmp_conf:tdomain_to_family(Domain),
     SocketOpts =
 	case Family of
@@ -340,15 +340,18 @@ socket_params(Domain, {IpAddr, IpPort}, BindTo, CommonSocketOpts) ->
 			    {0, [{fd, Fd} | SocketOpts]}
 		    end;
 		error ->
-		    {IpPort, [{ip, IpAddr} | SocketOpts]}
+		    socket_params(SocketOpts, Addr, BindTo)
 	    end;
 	_ ->
-	    case BindTo of
-		true ->
-		    {IpPort, [{ip, IpAddr} | SocketOpts]};
-		_ ->
-		    {IpPort, SocketOpts}
-	    end
+	    socket_params(SocketOpts, Addr, BindTo)
+    end.
+%%
+socket_params(SocketOpts, {IpAddr, IpPort}, BindTo) ->
+    case BindTo of
+	true ->
+	    {IpPort, [{ip, IpAddr} | SocketOpts]};
+	_ ->
+	    {IpPort, SocketOpts}
     end.
 
 common_socket_opts(Opts) ->
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index cf62edba1c..8cb6ec588e 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -161,7 +161,7 @@ get_timeout() ->
 	    get_timeout(os:type())
     end.
 
-get_timeout(_)       -> 3500.
+get_timeout(_)       -> 10000. % Trying to improve test results % 3500.
 
 %%----------------------------------------------------------------------
 %% Receives a trap from the agent.