From e1b759c0863e677527577af7cbf436d0574cbb00 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 10 Feb 2010 19:19:15 +0000
Subject: OTP-8433: Fix typos of lib/snmp/src/misc/snmp_config.erl OTP-8433:
 Kenji Rikitake

---
 lib/snmp/doc/src/notes.xml        | 13 +++++++++----
 lib/snmp/src/app/snmp.appup.src   |  6 ++++++
 lib/snmp/src/misc/snmp_config.erl |  2 +-
 lib/snmp/vsn.mk                   |  6 ++++--
 4 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'lib/snmp')

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 7984f2a536..dc2d879672 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -64,17 +64,22 @@
 
     <section>
       <title>Reported Fixed Bugs and Malfunctions</title>
+      <!-- 
       <p>-</p>
+      -->
 
-      <!-- 
       <list type="bulleted">
         <item>
-          <p>TBD. </p>
-          <p>Own Id: OTP-8384</p>
+          <p>The config utility 
+            (<seealso marker="snmp#config">snmp:config/0</seealso>)
+            generated a default notify.conf 
+            with a bad name for the starndard trap entry (was "stadard trap", 
+            but should have been "standard trap"). This has been corrected. </p>
+          <p>Kenji Rikitake</p>
+          <p>Own Id: OTP-8433</p>
         </item>
 
       </list>
-      -->
 
     </section>
 
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 74747b2e59..05aa3d0d48 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -25,6 +25,7 @@
   {"4.15",   
    [
     {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
@@ -34,6 +35,7 @@
   {"4.14",   
    [
     {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
@@ -49,6 +51,7 @@
    [
     {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
     {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
@@ -70,6 +73,7 @@
   {"4.15",   
    [
     {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
@@ -79,6 +83,7 @@
   {"4.14",   
    [
     {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
@@ -92,6 +97,7 @@
   {"4.13.5",
    [
     {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
+    {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 0ee373a4d4..c066680160 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -1806,7 +1806,7 @@ write_agent_snmp_notify_conf(Dir, NotifyType) ->
 "%% {\"standard inform\", \"std_inform\", inform}.\n"
 "%%\n\n",
     Hdr = header() ++ Comment, 
-    Conf = [{"stadard_trap", "std_trap", NotifyType}],
+    Conf = [{"standard trap", "std_trap", NotifyType}],
     write_agent_notify_config(Dir, Hdr, Conf).
 
 write_agent_notify_config(Dir, Hdr, Conf) ->
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index a6991cc04b..a151f332ae 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,10 +18,12 @@
 # %CopyrightEnd%
 
 SNMP_VSN = 4.16
-PRE_VSN  =-p02
+PRE_VSN  =-p03
 APP_VSN  = "snmp-$(SNMP_VSN)$(PRE_VSN)"
 
-TICKETS = OTP-8395
+TICKETS = \
+	OTP-8395 \
+	OTP-8433
 
 TICKETS_4_15 = OTP-8229 OTP-8249
 
-- 
cgit v1.2.3