[agent] When calling snmp_view_based_acm_mib:reconfigure/1 on a running node,

the vacmAccessTable whas not properly cleaned.
This means that if some entries in the vacm.conf file was removed
compared to the "current" config), while others where modified
and/or added, the removed entrie(s) would still exist in the vacmAccessTable.

7 files changed, 128 insertions, 41 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 493e7aa092..cb41ca8e3a 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -32,23 +32,54 @@
     <file>notes.xml</file>
   </header>
 
+  <section>
+    <title>SNMP Development Toolkit 4.18.1</title>
+    <p>Version 4.18.1 supports code replacement in runtime from/to
+      version 4.18, 4.17.1 and 4.17.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p> 
+    </section>
+
+    <section>
+      <title>Reported Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>[agent] When calling 
+	  <seealso marker="snmp_view_based_acm_mib#reconfigure">snmp_view_based_acm_mib:reconfigure/1</seealso> 
+	  on a running node, the table <c>vacmAccessTable</c> was not properly 
+	  cleaned. 
+	  This means that if some entries in the vacm.conf file was removed
+	  (compared to the <c>current</c> config), 
+	  while others where modified and/or added, the removed entrie(s), 
+	  would still exist in the <c>vacmAccessTable</c>. </p>
+          <p>Own Id: OTP-8981</p>
+	  <p>Aux Id: Seq 11750</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.18.1 -->
+
+
   <section><title>SNMP 4.18</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
-          <p>
-	    When the function FilterMod:accept_recv/2 returned false
-	    the SNMP agent stopped collecting messages from UDP.</p>
-          <p>
-	    Own Id: OTP-8761</p>
+          <p>Prepared for R14B.</p>
         </item>
       </list>
     </section>
 
-</section>
+  </section>
 
-<section>
+  <section>
     <title>SNMP Development Toolkit 4.17.1</title>
     <p>Version 4.17.1 supports code replacement in runtime from/to
       version 4.17, 4.16.2, 4.16.1, 4.16, 4.15, 4.14 and 4.13.5.</p>
diff --git a/lib/snmp/doc/src/snmp_view_based_acm_mib.xml b/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
index ffea256608..d595f6b93b 100644
--- a/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
+++ b/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,7 +38,10 @@
       SNMP-VIEW-BASED-ACM-MIB, and functions for configuring the database.
       </p>
     <p>The configuration files are described in the SNMP User's Manual.</p>
+
+    <marker id="configure"></marker>
   </description>
+
   <funcs>
     <func>
       <name>configure(ConfDir) -> void()</name>
@@ -48,27 +51,24 @@
       </type>
       <desc>
         <p>This function is called from the supervisor at system
-          start-up.
-          </p>
+	start-up. </p>
         <p>Inserts all data in the configuration files into the
-          database and destroys all old rows with StorageType
-          <c>volatile</c>.  The rows created from the configuration file
-          will have StorageType <c>nonVolatile</c>.
-          </p>
-        <p>All <c>snmp</c> counters are set to zero.
-          </p>
+	database and destroys all old rows with StorageType
+	<c>volatile</c>.  The rows created from the configuration file
+	will have StorageType <c>nonVolatile</c>. </p>
+        <p>All <c>snmp</c> counters are set to zero. </p>
         <p>If an error is found in the configuration file, it is
-          reported using the function <c>config_err/2</c> of the error
-          report module, and the function fails with the reason 
-          <c>configuration_error</c>.
-          </p>
+	reported using the function <c>config_err/2</c> of the error
+	report module, and the function fails with the reason 
+	<c>configuration_error</c>. </p>
         <p><c>ConfDir</c> is a string which points to the directory
-          where the configuration files are found.
-          </p>
-        <p>The configuration file read is: <c>vacm.conf</c>.
-          </p>
+	where the configuration files are found. </p>
+        <p>The configuration file read is: <c>vacm.conf</c>. </p>
+
+	<marker id="reconfigure"></marker>
       </desc>
     </func>
+
     <func>
       <name>reconfigure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-VIEW-BASED-ACM-MIB</fsummary>
@@ -88,18 +88,20 @@
         <p>All <c>snmp</c> counters are set to zero.
           </p>
         <p>If an error is found in the configuration file, it is
-          reported using the function <c>config_err/2</c> of the error
-          report module, and the function fails with the reason 
+          reported using the function 
+	  <seealso marker="snmpa_error#config_err">config_err/2</seealso> 
+	  of the error report module, and the function fails with the reason 
           <c>configuration_error</c>.
           </p>
         <p><c>ConfDir</c> is a string which points to the directory
           where the configuration files are found.
           </p>
-        <p>The configuration file read is: <c>vacm.conf</c>.
-                    <marker id="add_sec2group"></marker>
-</p>
+        <p>The configuration file read is: <c>vacm.conf</c>. </p>
+
+	<marker id="add_sec2group"></marker>
       </desc>
     </func>
+
     <func>
       <name>add_sec2group(SecModel, SecName, GroupName) -> Ret</name>
       <fsummary>Add one security to group definition</fsummary>
@@ -113,10 +115,13 @@
       </type>
       <desc>
         <p>Adds a security to group definition to the agent config. 
-          Equivalent to one vacmSecurityToGroup-line in the <c>vacm.conf</c> file.</p>
+	Equivalent to one vacmSecurityToGroup-line in the 
+	<c>vacm.conf</c> file.</p>
+
         <marker id="delete_sec2group"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_sec2group(Key) -> Ret</name>
       <fsummary>Delete one security to group definition</fsummary>
@@ -127,9 +132,11 @@
       </type>
       <desc>
         <p>Delete a security to group definition from the agent config.</p>
+
         <marker id="add_access"></marker>
       </desc>
     </func>
+
     <func>
       <name>add_access(GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV) -> Ret</name>
       <fsummary>Add one access definition</fsummary>
@@ -148,10 +155,12 @@
       </type>
       <desc>
         <p>Adds a access definition to the agent config. 
-          Equivalent to one vacmAccess-line in the <c>vacm.conf</c> file.</p>
-        <marker id="delete_access"></marker>
+	Equivalent to one vacmAccess-line in the <c>vacm.conf</c> file.</p>
+        
+	<marker id="delete_access"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_access(Key) -> Ret</name>
       <fsummary>Delete one access definition</fsummary>
@@ -161,10 +170,12 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Delete a access definition from the agent config.</p>
-        <marker id="add_view_tree_fam"></marker>
+	<p>Delete a access definition from the agent config.</p>
+
+	<marker id="add_view_tree_fam"></marker>
       </desc>
     </func>
+
     <func>
       <name>add_view_tree_fam(ViewIndex, SubTree, Status, Mask) -> Ret</name>
       <fsummary>Add one view tree family definition</fsummary>
@@ -178,11 +189,14 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Adds a view tree family definition to the agent config. 
-          Equivalent to one vacmViewTreeFamily-line in the <c>vacm.conf</c> file.</p>
-        <marker id="delete_view_tree_fam"></marker>
+	<p>Adds a view tree family definition to the agent config. 
+	Equivalent to one vacmViewTreeFamily-line in the 
+	<c>vacm.conf</c> file.</p>
+	  
+	  <marker id="delete_view_tree_fam"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_view_tree_fam(Key) -> Ret</name>
       <fsummary>Delete one view tree family definition</fsummary>
diff --git a/lib/snmp/doc/src/snmpa_error.xml b/lib/snmp/doc/src/snmpa_error.xml
index a7312e8b24..4dbafdfbb7 100644
--- a/lib/snmp/doc/src/snmpa_error.xml
+++ b/lib/snmp/doc/src/snmpa_error.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -51,6 +51,8 @@
       <c>error_report_mod</c>, see
       <seealso marker="snmp_config#configuration_params">configuration parameters</seealso>.
       </p>
+
+      <marker id="config_err"></marker>
   </description>
   <funcs>
     <func>
@@ -67,8 +69,11 @@
           </p>
         <p><c>Format</c> and <c>Args</c> are as in
           <c>io:format(Format, Args)</c>.</p>
+
+	  <marker id="user_err"></marker>
       </desc>
     </func>
+
     <func>
       <name>user_err(Format, Args) -> void()</name>
       <fsummary>Called if a user related error occurs</fsummary>
diff --git a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
index 657207b36e..5e188c74c5 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -181,6 +181,8 @@ init_tabs(Sec2Group, Access, View) ->
     snmpa_local_db:table_delete(db(vacmSecurityToGroupTable)),
     snmpa_local_db:table_create(db(vacmSecurityToGroupTable)),
     init_sec2group_table(Sec2Group),
+    ?vdebug("create vacm access table",[]),
+    snmpa_vacm:cleanup(),
     init_access_table(Access),
     ?vdebug("create vacm view-tree-family table",[]),
     snmpa_local_db:table_delete(db(vacmViewTreeFamilyTable)),
diff --git a/lib/snmp/src/agent/snmpa_vacm.erl b/lib/snmp/src/agent/snmpa_vacm.erl
index 2eacea4301..91cecfcd1e 100644
--- a/lib/snmp/src/agent/snmpa_vacm.erl
+++ b/lib/snmp/src/agent/snmpa_vacm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% 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
@@ -21,7 +21,7 @@
 -export([get_mib_view/5]).
 -export([init/1, init/2, backup/1]).
 -export([delete/1, get_row/1, get_next_row/1, insert/1, insert/2,
-	 dump_table/0]).
+	 cleanup/0, dump_table/0]).
 
 -include("SNMPv2-TC.hrl").
 -include("SNMP-VIEW-BASED-ACM-MIB.hrl").
@@ -256,6 +256,10 @@ delete(Key) ->
     ets:delete(snmpa_vacm, Key),
     dump_table().
 
+
+cleanup() ->
+    ets:delete_all_objects(snmpa_vacm).
+
 dump_table(true) ->
     dump_table();
 dump_table(_) ->
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 2375e3df70..fafbf79bb7 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,6 +22,12 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.18", 
+   [
+    {load_module, snmpa_vacm,              soft_purge, soft_purge, []},
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmpa_vacm]}
+   ]
+  },
   {"4.17.1", 
    [
     {load_module, snmp_community_mib, soft_purge, soft_purge, []},
@@ -66,6 +72,12 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.18", 
+   [
+    {load_module, snmpa_vacm,              soft_purge, soft_purge, []},
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmpa_vacm]}
+   ]
+  },
   {"4.17.1", 
    [
     {load_module, snmp_community_mib, soft_purge, soft_purge, []},
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 1229b12ae2..67cc05687d 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -1,3 +1,22 @@
-SNMP_VSN = 4.18
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-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%
+
+SNMP_VSN = 4.18.1
 PRE_VSN  =
 APP_VSN  = "snmp-$(SNMP_VSN)$(PRE_VSN)"