From fc649b12007a5d9a895c9bbcc4a3ede76085e35d Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 6 Dec 2010 16:02:57 +0100
Subject: 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".

---
 lib/snmp/doc/src/notes.xml                     | 74 ++++++++++++++++++++++----
 lib/snmp/src/agent/snmp_view_based_acm_mib.erl | 12 ++---
 lib/snmp/src/app/snmp.appup.src                | 10 ++++
 lib/snmp/vsn.mk                                | 21 +++++++-
 4 files changed, 99 insertions(+), 18 deletions(-)

(limited to 'lib/snmp')

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)"
-- 
cgit v1.2.3


From 5d01e37654bda53b0c81a654936abbaeb0e2f7d9 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 6 Dec 2010 16:07:00 +0100
Subject: 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".

---
 lib/snmp/doc/src/notes.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/snmp')

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index ae429d0751..f3bb9d25ea 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -47,8 +47,8 @@
       <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 
+	  when performing the is_set_ok and set opteration(s), 
+	  all values of the vacmAccessSecurityModel column was
 	  incorrectly translated to <c>any</c>. </p>
 <!-- 
 that is when calling: 
-- 
cgit v1.2.3


From 6728569903cfb466953ff7ee9d776beb76dca0f1 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 7 Dec 2010 11:00:08 +0100
Subject: 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*.

---
 lib/snmp/src/agent/snmp_view_based_acm_mib.erl | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/snmp')

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 c0bc727c68..e381452a91 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -540,24 +540,24 @@ verify_vacmAccessTable_col(?vacmAccessContextPrefix, Pref) ->
 verify_vacmAccessTable_col(?vacmAccessSecurityModel, 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;
 	_ ->
 	    wrongValue(?vacmAccessSecurityModel)
     end;
 verify_vacmAccessTable_col(?vacmAccessSecurityLevel, Level) ->
     case Level of
-        noAuthNoPriv -> 1;
-        authNoPriv   -> 2;
-        authPriv     -> 3;
-        1            -> 1;
-        2            -> 2;
-        3            -> 3;
+        noAuthNoPriv -> ?vacmAccessSecurityLevel_noAuthNoPriv;
+        authNoPriv   -> ?vacmAccessSecurityLevel_authNoPriv;
+        authPriv     -> ?vacmAccessSecurityLevel_authPriv;
+        ?vacmAccessSecurityLevel_noAuthNoPriv -> ?vacmAccessSecurityLevel_noAuthNoPriv;
+        ?vacmAccessSecurityLevel_authNoPriv   -> ?vacmAccessSecurityLevel_authNoPriv;
+        ?vacmAccessSecurityLevel_authPriv     -> ?vacmAccessSecurityLevel_authPriv;
         _            -> wrongValue(?vacmAccessSecurityLevel)
     end;
 verify_vacmAccessTable_col(?vacmAccessContextMatch, Match) ->
-- 
cgit v1.2.3


From dd99864e18829150951285d3819096e04ebda3de Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 17 Feb 2011 12:02:54 +0100
Subject: No auto-import of erlang:error/1,2.

---
 lib/snmp/test/snmp_appup_test.erl    | 4 +++-
 lib/snmp/test/snmp_test_mgr_misc.erl | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib/snmp')

diff --git a/lib/snmp/test/snmp_appup_test.erl b/lib/snmp/test/snmp_appup_test.erl
index 18509526cf..756636f79c 100644
--- a/lib/snmp/test/snmp_appup_test.erl
+++ b/lib/snmp/test/snmp_appup_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -30,6 +30,8 @@
 
 	]).
 
+-compile({no_auto_import, [error/1]}).
+
 -include("test_server.hrl").
 -include("snmp_test_lib.hrl").
 
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index ef1ba0b948..fc6dedd96d 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -33,6 +33,8 @@
 %% internal exports
 -export([init_packet/10]).
 
+-compile({no_auto_import, [error/2]}).
+
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
 
-- 
cgit v1.2.3


From 197d6abd8b6efb30c6237133ed08bf379f29cb84 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 22 Feb 2011 10:37:18 +0100
Subject: Prep for release: snmp-4.19

---
 lib/snmp/doc/src/notes.xml | 10 +++++-----
 lib/snmp/vsn.mk            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/snmp')

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index f3bb9d25ea..c42d62f013 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -33,8 +33,8 @@
   </header>
 
   <section>
-    <title>SNMP Development Toolkit 4.18.1</title>
-    <p>Version 4.18.1 supports code replacement in runtime from/to
+    <title>SNMP Development Toolkit 4.19</title>
+    <p>Version 4.19 supports code replacement in runtime from/to
       version 4.18, 4.17.1 and 4.17.</p>
 
     <section>
@@ -47,7 +47,7 @@
       <list type="bulleted">
         <item>
           <p>[agent] For the table vacmAccessTable, 
-	  when performing the is_set_ok and set opteration(s), 
+	  when performing the is_set_ok and set operation(s), 
 	  all values of the vacmAccessSecurityModel column was
 	  incorrectly translated to <c>any</c>. </p>
 <!-- 
@@ -63,7 +63,7 @@ snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
       <title>Incompatibilities</title>
       <p>-</p>
     </section>
-  </section> <!-- 4.18.1 -->
+  </section> <!-- 4.19 -->
 
 
   <section>
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 67cc05687d..617f0fce62 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -17,6 +17,6 @@
 #
 # %CopyrightEnd%
 
-SNMP_VSN = 4.18.1
+SNMP_VSN = 4.19
 PRE_VSN  =
 APP_VSN  = "snmp-$(SNMP_VSN)$(PRE_VSN)"
-- 
cgit v1.2.3


From bb3fef253dc2e1253d7c422c1d9846d13135f847 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 23 Feb 2011 21:00:48 +0100
Subject: Updated release notes and appup file.

---
 lib/snmp/doc/src/notes.xml      |  4 +--
 lib/snmp/src/app/snmp.appup.src | 80 +----------------------------------------
 2 files changed, 3 insertions(+), 81 deletions(-)

(limited to 'lib/snmp')

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index c42d62f013..7010b3c641 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>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -35,7 +35,7 @@
   <section>
     <title>SNMP Development Toolkit 4.19</title>
     <p>Version 4.19 supports code replacement in runtime from/to
-      version 4.18, 4.17.1 and 4.17.</p>
+      version 4.18.</p>
 
     <section>
       <title>Improvements and new features</title>
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 03a0044908..13a84d4ab1 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -26,45 +26,6 @@
    [
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}
    ]
-  },
-  {"4.17.1", 
-   [
-    {load_module, snmp_community_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_generic, soft_purge, soft_purge, []},
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_target_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []},
-    {load_module, snmpa_conf, soft_purge, soft_purge, []},
-    {update,      snmpa_target_cache, soft, soft_purge, soft_purge, []},
-    {load_module, snmpa_usm, soft_purge, soft_purge, []},
-    {load_module, snmpm, soft_purge, soft_purge, []},
-    {load_module, snmpm_conf, soft_purge, soft_purge, []},
-    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
-    {load_module, snmpm_usm, soft_purge, soft_purge, []}
-   ]
-  },
-  {"4.17", 
-   [
-    {load_module, snmp_community_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_generic, soft_purge, soft_purge, []},
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_target_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []},
-    {load_module, snmpa_conf, soft_purge, soft_purge, []},
-    {update,      snmpa_target_cache, soft, soft_purge, soft_purge, []},
-    {load_module, snmpa_usm, soft_purge, soft_purge, []},
-    {load_module, snmpm, soft_purge, soft_purge, []},
-    {load_module, snmpm_conf, soft_purge, soft_purge, []},
-    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
-    {load_module, snmpm_usm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_net_if, soft_purge, soft_purge, []}
-   ]
   }
  ], 
 
@@ -75,45 +36,6 @@
    [
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}
    ]
-  },
-  {"4.17.1", 
-   [
-    {load_module, snmp_community_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_generic, soft_purge, soft_purge, []},
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_target_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []},
-    {load_module, snmpa_conf, soft_purge, soft_purge, []},
-    {update,      snmpa_target_cache, soft, soft_purge, soft_purge, []},
-    {load_module, snmpa_usm, soft_purge, soft_purge, []},
-    {load_module, snmpm, soft_purge, soft_purge, []},
-    {load_module, snmpm_conf, soft_purge, soft_purge, []},
-    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
-    {load_module, snmpm_usm, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.17", 
-   [
-    {load_module, snmp_community_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_generic, soft_purge, soft_purge, []},
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_target_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []},
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []},
-    {load_module, snmpa_conf, soft_purge, soft_purge, []},
-    {update,      snmpa_target_cache, soft, soft_purge, soft_purge, []},
-    {load_module, snmpa_usm, soft_purge, soft_purge, []},
-    {load_module, snmpm, soft_purge, soft_purge, []},
-    {load_module, snmpm_conf, soft_purge, soft_purge, []},
-    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
-    {load_module, snmpm_usm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_net_if, soft_purge, soft_purge, []}
-   ]
   }
  ]
 }.
-- 
cgit v1.2.3