Merge branch 'maint-20' into maint

* maint-20:
  Updated OTP version
  Update release notes
  Update version numbers
  erts: Fix so that bind correct schedulers
  Update version
  Fix error handling when decoding an AVP with an alternate dictionary
  Remove unused function arguments
  Fix faulty recursion
  vsn -> 2.1.2
  Update appup for ERIERL-14684
  Fix speling error 'sndbuf' -> 'recbuf'
  Add zlib:set_controlling_process/2

4 files changed, 20 insertions, 30 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 4705804759..6bdcae5dd7 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,23 @@
   </header>
 
 
-  <section><title>SNMP 5.2.7</title>
+  <section><title>SNMP 5.2.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The <c>recbuf</c> configuration option was not propagated
+	    correctly to the socket for the SNMP Manager.</p>
+          <p>
+	    Own Id: OTP-13372 Aux Id: ERIERL-73 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index bde637744c..ca61782639 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -8,19 +8,6 @@
 %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
 %% {add_module,  snmpm_net_if_mt}
  [
-  {<<"5\\.2\\.6">>,
-   [{load_module, snmpc, soft_purge, soft_purge, []},
-    {load_module, snmpc_lib, soft_purge, soft_purge, []}]},
-  {<<"5\\.2\\.5">>,
-   [{load_module, snmpc, soft_purge, soft_purge, []},
-    {load_module, snmpc_lib, soft_purge, soft_purge, []},
-    {load_module, snmp_generic, soft_purge, soft_purge, []}]},
-  {<<"5\\.2\\.4">>,
-   [{load_module, snmpc, soft_purge, soft_purge, []},
-    {load_module, snmp_generic, soft_purge, soft_purge, []},
-    {load_module, snmp, soft_purge, soft_purge, []},
-    {load_module, snmpc_lib, soft_purge, soft_purge, []},
-    {load_module, snmpc_mib_gram, soft_purge, soft_purge, []}]},
   {<<"5\\..*">>, [{restart_application, snmp}]},	
   {<<"4\\..*">>, [{restart_application, snmp}]}
  ],
@@ -30,19 +17,6 @@
 %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
  
  [
-  {<<"5\\.2\\.6">>,
-   [{load_module, snmpc, soft_purge, soft_purge, []},
-    {load_module, snmpc_lib, soft_purge, soft_purge, []}]},
-  {<<"5\\.2\\.5">>,
-   [{load_module, snmpc, soft_purge, soft_purge, []},
-    {load_module, snmpc_lib, soft_purge, soft_purge, []},
-    {load_module, snmp_generic, soft_purge, soft_purge, []}]},
-  {<<"5\\.2\\.4">>,
-   [{load_module, snmpc, soft_purge, soft_purge, []},
-    {load_module, snmp_generic, soft_purge, soft_purge, []},
-    {load_module, snmp, soft_purge, soft_purge, []},
-    {load_module, snmpc_lib, soft_purge, soft_purge, []},
-    {load_module, snmpc_mib_gram, soft_purge, soft_purge, []}]},
   {<<"5\\..*">>, [{restart_application, snmp}]},	
   {<<"4\\..*">>, [{restart_application, snmp}]}
  ]  	       
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl
index 93c987eb0f..29216f9d6a 100644
--- a/lib/snmp/src/manager/snmpm_net_if.erl
+++ b/lib/snmp/src/manager/snmpm_net_if.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -367,7 +367,7 @@ common_socket_opts(Opts) ->
 	     default ->
 		 [];
 	     Sz ->
-		 [{sndbuf, Sz}]
+		 [{recbuf, Sz}]
 	 end ++
 	 case get_opt(Opts, no_reuse, false) of
 	     false ->
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 207f0084d8..ef48608bda 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.7
+SNMP_VSN    = 5.2.8
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"