For the table vacmAccessTable, when performing the is_set_ok and set

opteration(s), all values of the vacmAccessSecurityModel column was
incorrectly translated to "any".

5 files changed, 103 insertions, 18 deletions

diff --git a/lib/.gitignore b/lib/.gitignore
index 340baf5269..56b1ed2b84 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -531,6 +531,10 @@
 /percept/doc/src/percept_profile.xml
 /percept/doc/src/percept_ug.xml
 
+# snmp
+
+snmp/doc/intex.html
+
 # syntax_tools
 
 /syntax_tools/doc/src/chapter.xml
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 493e7aa092..ae429d0751 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -32,23 +32,75 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>SNMP 4.18</title>
+  <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] For the table vacmAccessTable, 
+	  when performing a is_set_ok or a set opteration, 
+	  all values of the <em>vacmAccessSecurityModel</em> column was 
+	  incorrectly translated to <c>any</c>. </p>
+<!-- 
+that is when calling: 
+snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
+-->
+          <p>Own Id: OTP-8980</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.18.1 -->
+
+
+  <section>
+    <title>SNMP Development Toolkit 4.18</title>
+    <p>Version 4.18 supports code replacement in runtime from/to
+      version 4.17.1 and 4.17.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <list type="bulleted">
+        <item>
+          <p>Prepared for R14B release.</p>
+        </item>
+      </list>
+    </section>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
+      <p>-</p> 
+<!--
+      <list type="bulleted">
         <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>[agent] When the function FilterMod:accept_recv/2 returned false
+	  the SNMP agent stopped collecting messages from UDP.</p>
+          <p>Own Id: OTP-8761</p>
         </item>
       </list>
+-->
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
     </section>
+  </section> <!-- 4.18 -->
 
-</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>
@@ -62,8 +114,8 @@
       <title>Reported Fixed Bugs and Malfunctions</title>
       <list type="bulleted">
         <item>
-          <p>When the function FilterMod:accept_recv/2
-             returned false the SNMP agent stopped collecting messages from UDP.</p>
+          <p>[agent] When the function FilterMod:accept_recv/2 returned false 
+	  the SNMP agent stopped collecting messages from UDP.</p>
           <p>Own Id: OTP-8761</p>
         </item>
       </list>
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..c0bc727c68 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -402,13 +402,13 @@ verify_vacmSecurityToGroupTable_cols([{Col, Val0}|Cols], Acc) ->
 verify_vacmSecurityToGroupTable_col(?vacmSecurityModel, Model) ->
     case Model of
 	any      -> ?SEC_ANY;
-	v1       -> ?SEC_ANY;
-	v2c      -> ?SEC_ANY;
-	usm      -> ?SEC_ANY;
+	v1       -> ?SEC_V1;
+	v2c      -> ?SEC_V2C;
+	usm      -> ?SEC_USM;
 	?SEC_ANY -> ?SEC_ANY;
-	?SEC_V1  -> ?SEC_ANY;
-	?SEC_V2C -> ?SEC_ANY;
-	?SEC_USM -> ?SEC_ANY;
+	?SEC_V1  -> ?SEC_V1;
+	?SEC_V2C -> ?SEC_V2C;
+	?SEC_USM -> ?SEC_USM;
 	_ ->
 	    ?vlog("verification of vacmSecurityModel(~w) ~p failed", 
 		  [?vacmSecurityModel, Model]),
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 2375e3df70..03a0044908 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,6 +22,11 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.18", 
+   [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}
+   ]
+  },
   {"4.17.1", 
    [
     {load_module, snmp_community_mib, soft_purge, soft_purge, []},
@@ -66,6 +71,11 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.18", 
+   [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}
+   ]
+  },
   {"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)"