Merge branch 'maint-r13' into dev

* maint-r13:
  snmp: Patch 1130
  inets: Patch 1129
  ssh: Patch 1127
  ssh: Patch 1126

Conflicts:
	lib/inets/doc/src/notes.xml
	lib/inets/src/inets_app/inets.appup.src
	lib/inets/vsn.mk
	lib/snmp/vsn.mk
	lib/ssh/doc/src/notes.xml
	lib/ssh/src/ssh.appup.src
	lib/ssh/vsn.mk

2 files changed, 26 insertions, 9 deletions

diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index 3a91cf4033..97a7a63dee 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2004-2010. 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.
-%%
+%% 
 %% %CopyrightEnd%
 %%
 -module(snmpa_net_if).
@@ -478,12 +478,13 @@ update_req_counter_outgoing(#state{limit = Limit, rcnt = RCnt} = S,
     S#state{rcnt = NewRCnt}.
     
 
-maybe_handle_recv(#state{filter = FilterMod} = S, 
+maybe_handle_recv(#state{usock = Sock, filter = FilterMod} = S, 
 		  Ip, Port, Packet) ->
     case (catch FilterMod:accept_recv(Ip, Port)) of
 	false ->
 	    %% Drop the received packet 
 	    inc(netIfMsgInDrops),
+	    active_once(Sock),
 	    S;
 	_ ->
 	    handle_recv(S, Ip, Port, Packet)
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 9ad16ffad2..2bd26e11db 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 1999-2010. 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.
-%%
+%% 
 %% %CopyrightEnd%
 %%
 
@@ -22,6 +22,11 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.17", 
+   [
+    {load_module, snmpa_net_if, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.16.2", 
    [
     {load_module, snmp_log, soft_purge, soft_purge, []},
@@ -29,6 +34,7 @@
     {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
     {load_module, snmpa_usm, soft_purge, soft_purge, []},
     {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {load_module, snmpa_net_if, soft_purge, soft_purge, []},
 
     {load_module, snmpm_mpd, soft_purge, soft_purge, []}
    ]
@@ -44,6 +50,7 @@
     {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_net_if, soft_purge, soft_purge, []},
 
     {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
     {update,      snmpm_server, soft, soft_purge, soft_purge, []}
@@ -61,6 +68,7 @@
     {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}, 
+    {load_module, snmpa_net_if, soft_purge, soft_purge, []},
 
     {load_module, snmpm_mpd, soft_purge, soft_purge, []},
     {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
@@ -149,6 +157,11 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.17", 
+   [
+    {load_module, snmpa_net_if, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.16.2", 
    [
     {load_module, snmp_log, soft_purge, soft_purge, []},
@@ -157,6 +170,7 @@
     {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
     {load_module, snmpa_usm, soft_purge, soft_purge, []},
     {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {load_module, snmpa_net_if, soft_purge, soft_purge, []},
 
     {load_module, snmpm_mpd, soft_purge, soft_purge, []}
    ]
@@ -172,6 +186,7 @@
     {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_net_if, soft_purge, soft_purge, []},
 
     {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
     {update,      snmpm_server, soft, soft_purge, soft_purge, []}
@@ -189,6 +204,7 @@
     {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_net_if, soft_purge, soft_purge, []},
 
     {load_module, snmpm_mpd, soft_purge, soft_purge, []},
     {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},