Merge branch 'bmk/snmp/snmp_user_default_return_values/OTP-10671' into bmk/snmp/snmp423_integration

3 files changed, 73 insertions, 640 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index b6b8751f6c..ea0495017d 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>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,6 +34,73 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.23</title>
+<!--
+    <p>Version 4.23 supports code replacement in runtime from/to
+    version 4.22.1, 
+    4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
+-->
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[manager] Polish return values of snmpm_user_default according 
+	  to snmpm_user doc.</p>
+	  <p>Luca Favatella</p>
+	  <p>Own Id: OTP-10671</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p>
+
+      <!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] Simultaneous 
+          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
+          calls can interfere.
+          The master agent did not check if a backup was already in 
+          progress when a backup request was accepted. </p>
+          <p>Own Id: OTP-9884</p>
+          <p>Aux Id: Seq 11995</p>
+        </item>
+
+      </list>
+      -->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[manager] The old Addr-and-Port based API functions, previously
+	  long deprecated and marked for deletion in R16B, has now been
+	  removed. </p>
+          <p>Own Id: OTP-10027</p>
+        </item>
+
+      </list>
+    </section>
+
+  </section> <!-- 4.23 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.22.1</title>
     <p>Version 4.22.1 supports code replacement in runtime from/to
     version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 
@@ -126,70 +193,6 @@
 
 
   <section>
-    <title>SNMP Development Toolkit 4.23</title>
-    <p>Version 4.23 supports code replacement in runtime from/to
-    version 4.22, 
-    4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>[agent] Documenting previously existing but undocumented function, 
-	  <seealso marker="snmp_generic#get_table_info">snmp_generic:get_table_info/2</seealso>. </p>
-	  <p>Own Id: OTP-9942</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <p>-</p>
-
-      <!--
-      <list type="bulleted">
-        <item>
-          <p>[agent] Simultaneous 
-          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
-          calls can interfere.
-          The master agent did not check if a backup was already in 
-          progress when a backup request was accepted. </p>
-          <p>Own Id: OTP-9884</p>
-          <p>Aux Id: Seq 11995</p>
-        </item>
-
-      </list>
-      -->
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-<!--
-      <p>-</p>
--->
-
-      <list type="bulleted">
-        <item>
-          <p>[manager] The old Addr-and-Port based API functions, previously
-	  long deprecated and marked for deletion in R16B, has now been
-	  removed. </p>
-          <p>Own Id: OTP-10027</p>
-        </item>
-
-      </list>
-    </section>
-
-  </section> <!-- 4.23 -->
-
-
-  <section>
     <title>SNMP Development Toolkit 4.22</title>
     <p>Version 4.22 supports code replacement in runtime from/to
     version 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 593ddd82bd..a6abf8439a 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. 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,582 +22,12 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
-  {"4.22", 
-   [
-    {load_module, snmpm,                   soft_purge, soft_purge, []}, 
-    {load_module, snmp_pdus,               soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmp_user_based_sm_mib,  soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.21.7", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21.6",
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  },
-  {"4.21.5",
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib,   soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib,     soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap,        soft_purge, soft_purge, []}, 
-    {load_module, snmpa_vacm,        soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db,   soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_mib,        soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  },
-  {"4.21.4", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21.3", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21.2", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21.1", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db,  soft, soft_purge, soft_purge, []},
-    {update,      snmpa_mib,       soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]},
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db,  soft, soft_purge, soft_purge, []},
-    {update,      snmpa_mib,       soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }
  ], 
 
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
-  {"4.22", 
-   [
-    {load_module, snmpm,                   soft_purge, soft_purge, []}, 
-    {load_module, snmp_pdus,               soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmp_user_based_sm_mib,  soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.21.7", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21.6",
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  },
-  {"4.21.5",
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib,   soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib,     soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap,        soft_purge, soft_purge, []}, 
-    {load_module, snmpa_vacm,        soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db,   soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_mib,        soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  },
-  {"4.21.4", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21.3", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21.2", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21.1", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db,  soft, soft_purge, soft_purge, []},
-    {update, snmpa_mib,       soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]},
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db,  soft, soft_purge, soft_purge, []},
-    {update, snmpa_mib,       soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }
  ]
+
 }.
 
diff --git a/lib/snmp/src/manager/snmpm_user_default.erl b/lib/snmp/src/manager/snmpm_user_default.erl
index d90fc3f258..015198cb76 100644
--- a/lib/snmp/src/manager/snmpm_user_default.erl
+++ b/lib/snmp/src/manager/snmpm_user_default.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. 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
@@ -62,7 +62,7 @@ handle_trap(TargetName, SnmpTrap, UserData) ->
 	 "~n   SnmpTrap: ~p"
 	 "~n   UserData: ~p", 
 	 [TargetName, SnmpTrap, UserData]),
-    ok.
+    ignore.
 
 
 handle_inform(TargetName, SnmpInform, UserData) ->
@@ -80,7 +80,7 @@ handle_report(TargetName, SnmpReport, UserData) ->
 	 "~n   SnmpReport: ~p"
 	 "~n   UserData:   ~p", 
 	 [TargetName, SnmpReport, UserData]),
-    ok.
+    ignore.
 
 
 info(F, A) ->