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

5 files changed, 89 insertions, 34 deletions

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]},