Merge branch 'bmk/snmp4217_integration/r15' into maint-r15

* bmk/snmp4217_integration/r15:
  Prepare release
  [snmp/agent] Add proper release notes
  [snmp/agent] Wrong OID used for error message reply
  [snmp/agent] Added backup check for local_db
  [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere

9 files changed, 378 insertions, 74 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 942d943c3c..704ff0a20f 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,6 +34,64 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.21.7</title>
+    <p>Version 4.21.7 supports code replacement in runtime from/to
+    version 4.21.6, 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and 
+    4.20. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+      <!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] DoS attack using GET-BULK with large value of 
+	  MaxRepetitions.
+	  A preventive method has been implementing by simply 
+	  limit the number of varbinds that can be included in 
+	  a Get-BULK response message. This is specified by the 
+	  new config option, 
+	  <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>. 
+	  </p>
+	  <p>Own Id: OTP-9700</p>
+        </item>
+
+      </list>
+      -->
+
+    </section>
+
+    <section>
+      <title>Reported 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>
+    </section>
+
+  </section> <!-- 4.21.7 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.21.6</title>
     <p>Version 4.21.6 supports code replacement in runtime from/to
     version 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and 
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index 27d89ea4e3..2322af28cc 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -198,12 +198,18 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
       <type>
         <v>BackupDir = string()</v>
         <v>Agent = pid() | atom()</v>
+        <v>Reason = backup_in_progress | term()</v>
       </type>
       <desc>
         <p>Backup persistent/permanent data handled by the agent
           (such as local-db, mib-data and vacm). </p>
         <p>Data stored by mnesia is not handled. </p>
         <p>BackupDir cannot be identical to DbDir. </p>
+        <p>Simultaneous backup calls are <em>not</em> allowed. 
+	That is, two different processes cannot simultaneously 
+	successfully call this function. One of them will be first, 
+	and succeed. The second will fail with the error reason
+	<c>backup_in_progress</c>. </p>
 
         <marker id="info"></marker>
       </desc>
@@ -217,13 +223,13 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
       </type>
       <desc>
         <p>Returns a list (a dictionary) containing information about
-          the agent. Information includes loaded MIBs, registered
-          sub-agents, some information about the memory allocation. </p>
-        <p>As of version 4.4 the format of the info has been changed. 
-          To convert the info to the old format, call the 
-          <seealso marker="#old_info_format">old_info_format</seealso> 
-          function. </p>
-
+	the agent. Information includes loaded MIBs, registered
+	sub-agents, some information about the memory allocation. </p>
+	<p>As of version 4.4 the format of the info has been changed. 
+	To convert the info to the old format, call the 
+	<seealso marker="#old_info_format">old_info_format</seealso> 
+	function. </p>
+	
         <marker id="old_info_format"></marker>
       </desc>
     </func>
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 17cb9c9fe3..9cc986cf47 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -1262,7 +1262,8 @@ handle_call(info, _From, S) ->
 handle_call(get_net_if, _From, S) ->
     {reply, get(net_if), S};
 
-handle_call({backup, BackupDir}, From, S) ->
+%% Only accept a backup request if there is none already in progress
+handle_call({backup, BackupDir}, From, #state{backup = undefined} = S) ->
     ?vlog("backup: ~p", [BackupDir]),
     Pid = self(),
     V   = get(verbosity),
@@ -1279,7 +1280,11 @@ handle_call({backup, BackupDir}, From, S) ->
 	  end),
     ?vtrace("backup server: ~p", [BackupServer]),
     {noreply, S#state{backup = {BackupServer, From}}};
-    
+
+handle_call({backup, _BackupDir}, From, #state{backup = Backup} = S) ->
+    ?vinfo("backup already in progress: ~p", [Backup]),
+    {reply, {error, backup_in_progress}, S};
+
 handle_call(dump_mibs, _From, S) ->
     Reply = snmpa_mib:dump(get(mibserver)),
     {reply, Reply, S};
diff --git a/lib/snmp/src/agent/snmpa_local_db.erl b/lib/snmp/src/agent/snmpa_local_db.erl
index 5b04c70054..1ec8dd3874 100644
--- a/lib/snmp/src/agent/snmpa_local_db.erl
+++ b/lib/snmp/src/agent/snmpa_local_db.erl
@@ -486,7 +486,11 @@ handle_call({match, Name, Db, Pattern}, _From, State) ->
     L1 = match(Db, Name, Pattern, State),
     {reply, lists:delete([undef], L1), State};
 
-handle_call({backup, BackupDir}, From, #state{dets = Dets} = State) ->
+%% This check (that there is no backup already in progress) is also 
+%% done in the master agent process, but just in case a user issues 
+%% a backup call to this process directly, we add a similar check here. 
+handle_call({backup, BackupDir}, From, 
+	    #state{backup = undefined, dets = Dets} = State) ->
     ?vlog("backup: ~p",[BackupDir]),
     Pid = self(),
     V   = get(verbosity),
@@ -511,6 +515,10 @@ handle_call({backup, BackupDir}, From, #state{dets = Dets} = State) ->
 	    {reply, Error, State}
     end;
 
+handle_call({backup, _BackupDir}, From, #state{backup = Backup} = S) ->
+    ?vinfo("backup already in progress: ~p", [Backup]),
+    {reply, {error, backup_in_progress}, S};
+
 handle_call(dump, _From, #state{dets = Dets} = State) ->
     ?vlog("dump",[]),
     dets_sync(Dets),
diff --git a/lib/snmp/src/agent/snmpa_mib.erl b/lib/snmp/src/agent/snmpa_mib.erl
index ce90db18b3..574467d38f 100644
--- a/lib/snmp/src/agent/snmpa_mib.erl
+++ b/lib/snmp/src/agent/snmpa_mib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. 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
@@ -552,8 +552,12 @@ handle_call({dump, File}, _From, #state{data = Data} = State) ->
     Reply = snmpa_mib_data:dump(Data, File),
     {reply, Reply, State};
     
-handle_call({backup, BackupDir}, From, #state{data = Data} = State) ->
-    ?vlog("backup to ~s",[BackupDir]),
+%% This check (that there is no backup already in progress) is also 
+%% done in the master agent process, but just in case a user issues 
+%% a backup call to this process directly, we add a similar check here. 
+handle_call({backup, BackupDir}, From, 
+	    #state{backup = undefined, data = Data} = State) ->
+    ?vlog("backup to ~s", [BackupDir]),
     Pid = self(),
     V   = get(verbosity),
     case file:read_file_info(BackupDir) of
@@ -576,6 +580,10 @@ handle_call({backup, BackupDir}, From, #state{data = Data} = State) ->
 	    {reply, Error, State}
     end;
     
+handle_call({backup, _BackupDir}, From, #state{backup = Backup} = S) ->
+    ?vinfo("backup already in progress: ~p", [Backup]),
+    {reply, {error, backup_in_progress}, S};
+
 handle_call(stop, _From, State) ->
     ?vlog("stop",[]),    
     {stop, normal, ok, State};
diff --git a/lib/snmp/src/agent/snmpa_mpd.erl b/lib/snmp/src/agent/snmpa_mpd.erl
index 0305e1fbec..2d37ea56f0 100644
--- a/lib/snmp/src/agent/snmpa_mpd.erl
+++ b/lib/snmp/src/agent/snmpa_mpd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. 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
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 254e697039..c8e5eec6db 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,15 +22,24 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.21.6",
+   [
+    {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, []}
+   ]
+  },
   {"4.21.5",
    [
     {load_module, snmpa, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [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, []}, 
+    {load_module, snmp_target_mib,   soft_purge, soft_purge, [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, []}
+    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}
    ]
   },
   {"4.21.4", 
@@ -44,7 +53,9 @@
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, 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, []}
    ]
   }, 
   {"4.21.3", 
@@ -59,7 +70,8 @@
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {update,      snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, []}
+    {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.2", 
@@ -76,7 +88,8 @@
     {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_agent, soft, soft_purge, soft_purge, []}
+    {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.1", 
@@ -92,8 +105,9 @@
     {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_agent, 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, []}, 
     {update,      snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
@@ -110,8 +124,9 @@
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]},
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update,      snmpa_agent, 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, []}, 
     {update,      snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
@@ -138,7 +153,8 @@
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mpd]}, 
+    {update,      snmpa_mib,    soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent,  soft, soft_purge, soft_purge, [snmpa_mpd]}, 
     {update,      snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, 
     {update,      snmpm_server, soft, soft_purge, soft_purge, 
      [snmpm_net_if, snmpm_mpd, snmpm_config]}, 
@@ -170,6 +186,7 @@
     {update, snmp_note_store, soft, 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, [snmpa_mpd]}, 
     {update,      snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, 
     {update,      snmpm_server, soft, soft_purge, soft_purge, 
@@ -183,15 +200,24 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.21.6",
+   [
+    {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, []}
+   ]
+  },
   {"4.21.5",
    [
     {load_module, snmpa, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [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, []}, 
+    {load_module, snmp_target_mib,   soft_purge, soft_purge, [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_agent, 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, []}
    ]
   },
   {"4.21.4", 
@@ -205,7 +231,9 @@
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent, 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, []}
    ]
   }, 
   {"4.21.3", 
@@ -220,7 +248,8 @@
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
+    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.2", 
@@ -237,7 +266,8 @@
     {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_agent, soft, soft_purge, soft_purge, []}
+    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.1", 
@@ -253,8 +283,9 @@
     {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_agent, 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, []}, 
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
@@ -271,8 +302,9 @@
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, []},
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_agent, 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, []}, 
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
@@ -299,7 +331,8 @@
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mpd]}, 
+    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, [snmpa_mpd]}, 
     {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, 
     {update, snmpm_server, soft, soft_purge, soft_purge, 
      [snmpm_net_if, snmpm_mpd, snmpm_config]}, 
@@ -330,7 +363,8 @@
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mpd]}, 
+    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, [snmpa_mpd]}, 
     {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, 
     {update, snmpm_server, soft, soft_purge, soft_purge, 
      [snmpm_net_if, snmpm_mpd, snmpm_config]}, 
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index abfd528639..e968bc65b1 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. 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
@@ -222,7 +222,7 @@ groups() ->
        {group, otp_7157}
       ]
      },
-     {tickets2, [], [otp8395]},
+     {tickets2, [], [otp8395, otp9884]},
      {otp_4394, [], [otp_4394_test]},
      {otp_7157, [], [otp_7157_test]
      }
@@ -322,6 +322,12 @@ init_per_testcase(otp8395 = Case, Config) when is_list(Config) ->
 	 "~n   Config: ~p", [Case, Config]),
     Config2 = init_per_testcase2(Case, init_per_suite(Config)), 
     otp8395({init, Config2});
+init_per_testcase(otp9884 = Case, Config) when is_list(Config) ->
+    ?DBG("init_per_testcase -> entry with"
+	 "~n   Case:   ~p"
+	 "~n   Config: ~p", [Case, Config]),
+    Config2 = init_per_testcase2(Case, init_per_suite(Config)), 
+    otp9884({init, Config2});
 init_per_testcase(otp_7157_test = _Case, Config) when is_list(Config) ->
     ?DBG("init_per_testcase -> entry with"
 	 "~n   Case:   ~p"
@@ -349,6 +355,8 @@ init_per_testcase(_Case, Config) when is_list(Config) ->
 
 end_per_testcase(otp8395, Config) when is_list(Config) ->
     otp8395({fin, Config});
+end_per_testcase(otp9884, Config) when is_list(Config) ->
+    otp9884({fin, Config});
 end_per_testcase(_Case, Config) when is_list(Config) ->
     ?DBG("end_per_testcase -> entry with"
 	 "~n   Case:   ~p"
@@ -5238,16 +5246,6 @@ loop_it_2(Oid, N) ->
 %%%-----------------------------------------------------------------
 
 
-
-
-
-%% These are (ticket) test cases where the initiation has to be done
-%% individually.
-
-
-
-
-
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1128
 %% Slogan: Bug in handling of createAndWait set-requests.
@@ -5888,7 +5886,7 @@ otp_7157_test1(MA) ->
 otp8395({init, Config}) when is_list(Config) ->
     ?DBG("otp8395(init) -> entry with"
 	 "~n   Config: ~p", [Config]),
-    
+
     %% -- 
     %% Start nodes
     %% 
@@ -5896,7 +5894,7 @@ otp8395({init, Config}) when is_list(Config) ->
     {ok, AgentNode}    = start_node(agent),
     %% {ok, SubAgentNode} = start_node(sub_agent),
     {ok, ManagerNode}  = start_node(manager),
-    
+
     %% -- 
     %% Mnesia init
     %% 
@@ -5904,10 +5902,10 @@ otp8395({init, Config}) when is_list(Config) ->
     AgentDbDir = ?config(agent_db_dir, Config),
     AgentMnesiaDir = filename:join([AgentDbDir, "mnesia"]),
     mnesia_init(AgentNode, AgentMnesiaDir),
-    
-%%     SubAgentDir = ?config(sub_agent_dir, Config),
-%%     SubAgentMnesiaDir = filename:join([SubAgentDir, "mnesia"]),
-%%     mnesia_init(SubAgentNode, SubAgentMnesiaDir),
+
+    %% SubAgentDir = ?config(sub_agent_dir, Config),
+    %% SubAgentMnesiaDir = filename:join([SubAgentDir, "mnesia"]),
+    %% mnesia_init(SubAgentNode, SubAgentMnesiaDir),
 
     %% ok = mnesia_create_schema(AgentNode, [AgentNode, SubAgentNode]), 
     %% ok = mnesia:create_schema([AgentNode, SubAgentNode]),
@@ -5932,12 +5930,12 @@ otp8395({init, Config}) when is_list(Config) ->
     %% SubAgentIP        = tuple_to_list(SubAgentIP0), 
     {ok, ManagerIP0}  = snmp_misc:ip(ManagerHost),
     ManagerIP         = tuple_to_list(ManagerIP0),
-    
+
 
     %% --
     %% Write agent config
     %% 
-    
+
     Vsns           = [v1], 
     AgentConfDir   = ?config(agent_conf_dir, Config),
     ManagerConfDir = ?config(manager_top_dir, Config),
@@ -5961,7 +5959,7 @@ otp8395({init, Config}) when is_list(Config) ->
 			   {manager_node,  ManagerNode},
 			   {manager_host,  ManagerHost}, 
 			   {manager_ip,    ManagerIP}|Config]),
-    
+
     %% -- 
     %% Create watchdog 
     %% 
@@ -5973,7 +5971,7 @@ otp8395({init, Config}) when is_list(Config) ->
 otp8395({fin, Config}) when is_list(Config) ->
     ?DBG("otp8395(fin) -> entry with"
 	 "~n   Config: ~p", [Config]),
-    
+
     AgentNode   = ?config(agent_node, Config),
     ManagerNode = ?config(manager_node, Config),
 
@@ -5981,11 +5979,11 @@ otp8395({fin, Config}) when is_list(Config) ->
     %% Stop agent (this is the nice way to do it, 
     %% so logs and files can be closed in the proper way).
     %% 
-    
+
     AgentSup = ?config(agent_sup, Config),
     ?DBG("otp8395(fin) -> stop (stand-alone) agent: ~p", [AgentSup]),
     stop_stdalone_agent(AgentSup), 
-    
+
     %% - 
     %% Stop mnesia
     %% 
@@ -6001,8 +5999,8 @@ otp8395({fin, Config}) when is_list(Config) ->
     stop_node(AgentNode),
 
 
-%%     SubAgentNode = ?config(sub_agent_node, Config),
-%%     stop_node(SubAgentNode),
+    %% SubAgentNode = ?config(sub_agent_node, Config),
+    %% stop_node(SubAgentNode),
 
 
     %% - 
@@ -6022,7 +6020,7 @@ otp8395(doc) ->
 otp8395(Config) when is_list(Config) ->
     ?DBG("otp8395 -> entry with"
 	 "~n   Config: ~p", [Config]),
-    
+
     ?SLEEP(1000),
 
     %% This is just to dirty trick for the ***old*** test-code
@@ -6040,8 +6038,8 @@ otp8395(Config) when is_list(Config) ->
     {ok, LogInfo} = rpc:call(AgentNode, snmpa, log_info, []),
     ?DBG("otp8395 -> LogInfo: ~p", [LogInfo]), 
 
-%%     SyncRes = rpc:call(AgentNode, snmp, log_sync, [?audit_trail_log_name]),
-%%     ?DBG("otp8395 -> SyncRes: ~p", [SyncRes]), 
+    %% SyncRes = rpc:call(AgentNode, snmp, log_sync, [?audit_trail_log_name]),
+    %% ?DBG("otp8395 -> SyncRes: ~p", [SyncRes]), 
 
     ok = agent_log_validation(AgentNode),
     LTTRes = 
@@ -6051,7 +6049,195 @@ otp8395(Config) when is_list(Config) ->
     ?SLEEP(1000),
     ?DBG("otp8395 -> done", []),
     ok.
-		    
+
+
+%%-----------------------------------------------------------------
+
+otp9884({init, Config}) when is_list(Config) ->
+    ?DBG("otp9884(init) -> entry with"
+	 "~n   Config: ~p", [Config]),
+
+    %% -- 
+    %% Start nodes
+    %% 
+
+    {ok, AgentNode}   = start_node(agent),
+
+    %% We don't use a manager in this test but the (common) config 
+    %% function takes an argument that is derived from this
+    {ok, ManagerNode} = start_node(manager), 
+
+    %% -- 
+    %% Mnesia init
+    %% 
+
+    AgentDbDir = ?config(agent_db_dir, Config),
+    AgentMnesiaDir = filename:join([AgentDbDir, "mnesia"]),
+    mnesia_init(AgentNode, AgentMnesiaDir),
+
+    mnesia_create_schema(AgentNode, [AgentNode]),
+
+    mnesia_start(AgentNode),
+
+    %% --
+    %% Host & IP
+    %% 
+
+    AgentHost   = ?HOSTNAME(AgentNode),
+    ManagerHost = ?HOSTNAME(ManagerNode),
+
+    Host              = snmp_test_lib:hostname(), 
+    Ip                = ?LOCALHOST(),
+    {ok, AgentIP0}    = snmp_misc:ip(AgentHost),
+    AgentIP           = tuple_to_list(AgentIP0), 
+    {ok, ManagerIP0}  = snmp_misc:ip(ManagerHost),
+    ManagerIP         = tuple_to_list(ManagerIP0),
+
+
+    %% --
+    %% Write agent config
+    %% 
+
+    Vsns           = [v1], 
+    ManagerConfDir = ?config(manager_top_dir, Config),
+    AgentConfDir   = ?config(agent_conf_dir, Config),
+    AgentTopDir    = ?config(agent_top_dir, Config),
+    AgentBkpDir1   = filename:join([AgentTopDir, backup1]),
+    AgentBkpDir2   = filename:join([AgentTopDir, backup2]),
+    ok = file:make_dir(AgentBkpDir1),
+    ok = file:make_dir(AgentBkpDir2),
+    AgentBkpDirs = [AgentBkpDir1, AgentBkpDir2], 
+    snmp_agent_test_lib:config(Vsns, 
+			       ManagerConfDir, AgentConfDir, 
+			       ManagerIP, AgentIP),
+
+
+    %% --
+    %% Start the agent
+    %% 
+
+    Config2 = start_agent([{host,              Host}, 
+			   {ip,                Ip}, 
+			   {agent_node,        AgentNode}, 
+			   {agent_host,        AgentHost}, 
+			   {agent_ip,          AgentIP}, 
+			   {agent_backup_dirs, AgentBkpDirs}|Config]),
+
+    %% -- 
+    %% Create watchdog 
+    %% 
+
+    Dog = ?WD_START(?MINS(1)),
+
+    [{watchdog, Dog} | Config2];
+
+otp9884({fin, Config}) when is_list(Config) ->
+    ?DBG("otp9884(fin) -> entry with"
+	 "~n   Config: ~p", [Config]),
+
+    AgentNode   = ?config(agent_node, Config),
+    ManagerNode = ?config(manager_node, Config),
+
+    %% -
+    %% Stop agent (this is the nice way to do it, 
+    %% so logs and files can be closed in the proper way).
+    %% 
+
+    AgentSup = ?config(agent_sup, Config),
+    ?DBG("otp9884(fin) -> stop (stand-alone) agent: ~p", [AgentSup]),
+    stop_stdalone_agent(AgentSup), 
+
+    %% - 
+    %% Stop mnesia
+    %% 
+    ?DBG("otp9884(fin) -> stop mnesia", []),
+    mnesia_stop(AgentNode),
+
+
+    %% - 
+    %% Stop the agent node
+    %% 
+
+    ?DBG("otp9884(fin) -> stop agent node", []),
+    stop_node(AgentNode),
+
+
+    %%     SubAgentNode = ?config(sub_agent_node, Config),
+    %%     stop_node(SubAgentNode),
+
+
+    %% - 
+    %% Stop the manager node
+    %% 
+
+    ?DBG("otp9884(fin) -> stop manager node", []),
+    stop_node(ManagerNode),
+
+    Dog = ?config(watchdog, Config),
+    ?WD_STOP(Dog),
+    lists:keydelete(watchdog, 1, Config);
+
+otp9884(doc) ->
+    "OTP-9884 - Simlutaneous backup call should not work. ";
+
+otp9884(Config) when is_list(Config) ->
+    ?DBG("otp9884 -> entry with"
+	 "~n   Config: ~p", [Config]),
+
+    AgentNode = ?config(agent_node, Config),
+    [AgentBkpDir1, AgentBkpDir2] = ?config(agent_backup_dirs, Config),
+    Self = self(), 
+    timer:apply_after(1000, 
+		      ?MODULE, otp9884_backup, [AgentNode, Self, first,  AgentBkpDir1]), 
+    timer:apply_after(1000, 
+		      ?MODULE, otp9884_backup, [AgentNode, Self, second, AgentBkpDir2]),
+    otp9884_await_backup_completion(undefined, undefined),
+
+    ?DBG("otp9884 -> done", []),
+    ok.
+
+
+otp9884_backup(Node, Pid, Tag, Dir) ->
+    io:format("[~w] call backup function~n", [Tag]),
+    Res = rpc:call(Node, snmpa, backup, [Dir]),
+    io:format("[~w] backup result: ~p~n", [Tag, Res]),
+    Pid ! {otp9884_backup_complete, Tag, Res}.
+
+otp9884_await_backup_completion(ok, Second) 
+  when ((Second =/= ok) andalso (Second =/= undefined)) ->
+    io:format("otp9884_await_backup_completion -> "
+	      "first backup succeed and second failed (~p)~n", [Second]),
+    ok;
+otp9884_await_backup_completion(First, ok) 
+  when ((First =/= ok) andalso (First =/= undefined)) ->
+    io:format("otp9884_await_backup_completion -> "
+	      "second backup succeed and first failed (~p)~n", [First]),
+    ok;
+otp9884_await_backup_completion(First, Second) 
+  when (((First =:= undefined) andalso (Second =:= undefined)) 
+	orelse 
+	((First =:= undefined) andalso (Second =/= undefined)) 
+	orelse 
+	((First =/= undefined) andalso (Second =:= undefined))) ->
+    io:format("otp9884_await_backup_completion -> await complete messages~n", []),
+    receive
+	{otp9884_backup_complete, first, Res} ->
+	    io:format("otp9884_await_backup_completion -> "
+		      "received complete message for first: ~p~n", [Res]),
+	    otp9884_await_backup_completion(Res, Second);
+	{otp9884_backup_complete, second, Res} ->
+	    io:format("otp9884_await_backup_completion -> "
+		      "received complete message for second: ~p~n", [Res]),
+	    otp9884_await_backup_completion(First, Res)
+    after 10000 ->
+	    %% we have waited long enough
+	    throw({error, {timeout, First, Second}})
+    end;
+otp9884_await_backup_completion(First, Second) ->
+    throw({error, {bad_completion, First, Second}}).
+
+
+%%-----------------------------------------------------------------
 
 agent_log_validation(Node) ->
     rpc:call(Node, ?MODULE, agent_log_validation, []).
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 1fbad654f7..fb1dcb6c41 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,7 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 4.21.6
+SNMP_VSN    = 4.21.7
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
-