From dda02f0e90a72620745878e4834849029f3e616d Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 19 Jan 2012 17:48:53 +0100
Subject: [snmp/agent] Incorrect mib server cache gclimit update

Mib server cache gclimit update function incorrectly calls
age update function. The gclimit update function update_mibs_cache_gclimit/1
incorrectly called update_mibs_cache_age/2 update function.

OTP-9868
---
 lib/snmp/doc/src/notes.xml      | 59 ++++++++++++++++++++++++++++++++++++++++-
 lib/snmp/src/agent/snmpa.erl    |  4 +--
 lib/snmp/src/app/snmp.appup.src | 16 ++++++++++-
 lib/snmp/vsn.mk                 |  8 +++---
 4 files changed, 80 insertions(+), 7 deletions(-)

(limited to 'lib/snmp')

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 1e31d72a2c..9db372dbe1 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,63 @@
     <file>notes.xml</file>
   </header>
 
+  <section>
+    <title>SNMP Development Toolkit 4.17.3</title>
+
+    <p>Version 4.17.3 supports code replacement in runtime from/to
+      version 4.17.2, 4.17.1, 4.17, 4.16.2, 4.16.1 and 4.16.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <!--
+      <p>-</p>
+      -->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent] Mib server cache gclimit update function incorrectly calls 
+	  age update function. 
+	  The gclimit update function, 
+	  <seealso marker="snmpa#update_mibs_cache_gclimit">update_mibs_cache_gclimit/1</seealso>, 
+	  <em>incorrectly</em> called the age update function, 
+	  <seealso marker="snmpa#update_mibs_cache_age">update_mibs_cache_age/2</seealso>. </p>
+	  <p>Johan Claesson</p>
+          <p>Own Id: OTP-9868</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Reported Fixed Bugs and Malfunctions</title>
+      <p>-</p>
+
+      <!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] Originating discovery problems. </p>
+          <p>Invalid state variable update during second stage of
+            discovery causes master agent crash. </p>
+          <p>Also the net_if process failed to activate socket
+            ({active, once}) after first discovery response was sent. </p>
+          <p>Own Id: OTP-8044</p>
+          <p>Aux Id: Seq 11295</p>
+        </item>
+
+      </list>
+      -->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.17.3 -->
+
+
   <section>
     <title>SNMP Development Toolkit 4.17.2</title>
 
diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index 87b191caed..5ff0883be3 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. 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
@@ -363,7 +363,7 @@ update_mibs_cache_age(Agent, Age) ->
 
 
 update_mibs_cache_gclimit(GcLimit) ->
-    update_mibs_cache_age(snmp_master_agent, GcLimit).
+    update_mibs_cache_gclimit(snmp_master_agent, GcLimit).
 
 update_mibs_cache_gclimit(Agent, GcLimit) ->
     snmpa_agent:update_mibs_cache_gclimit(Agent, GcLimit).
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 6353fc979e..30f2075bc0 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. 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
@@ -22,14 +22,21 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.17.2",
+   [
+    {load_module, snmpa, soft_purge, soft_purge, []}
+   ]
+  },
   {"4.17.1",
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, [snmpm_server]},
     {update, snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   },
   {"4.17", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
     {load_module, snmpa_net_if, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, [snmpm_server]},
     {update, snmpm_server, soft, soft_purge, soft_purge, []}
@@ -92,14 +99,21 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.17.2",
+   [
+    {load_module, snmpa, soft_purge, soft_purge, []}
+   ]
+  },
   {"4.17.1",
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, [snmpm_server]},
     {update, snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   },
   {"4.17", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
     {load_module, snmpa_net_if, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, [snmpm_server]},
     {update, snmpm_server, soft, soft_purge, soft_purge, []}
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 39ec3dc7d4..9dd47a741c 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. 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
@@ -17,11 +17,13 @@
 #
 # %CopyrightEnd%
 
-SNMP_VSN = 4.17.2
+SNMP_VSN = 4.17.3
 PRE_VSN  =
 APP_VSN  = "snmp-$(SNMP_VSN)$(PRE_VSN)"
 
-TICKETS = OTP-9236
+TICKETS = OTP-9868
+
+TICKETS_4_17_2 = OTP-9236
 
 TICKETS_4_17_1 = OTP-8761
 
-- 
cgit v1.2.3