Merge branch 'bmk/snmp/agent/mib_storage_behaviour/OTP-11107' into bmk/snmp/snmp424_integration/r16

Conflicts:
	lib/snmp/doc/src/notes.xml

2 files changed, 11 insertions, 8 deletions

diff --git a/lib/snmp/src/app/snmp.app.src b/lib/snmp/src/app/snmp.app.src
index dc5acbd4a0..904d17954b 100644
--- a/lib/snmp/src/app/snmp.app.src
+++ b/lib/snmp/src/app/snmp.app.src
@@ -48,12 +48,15 @@
              snmpa_error_io,
              snmpa_error_logger,
              snmpa_error_report,
-             snmpa_general_db,
              snmpa_local_db,
              snmpa_mib,
              snmpa_mib_data,
              snmpa_mib_data_tttn,
              snmpa_mib_lib,
+             snmpa_mib_storage,
+             snmpa_mib_storage_ets,
+             snmpa_mib_storage_dets,
+             snmpa_mib_storage_mnesia,
              snmpa_misc_sup,
              snmpa_mpd,
              snmpa_net_if,
diff --git a/lib/snmp/src/app/snmp_app.erl b/lib/snmp/src/app/snmp_app.erl
index deb42cc373..0cfbb22a5a 100644
--- a/lib/snmp/src/app/snmp_app.erl
+++ b/lib/snmp/src/app/snmp_app.erl
@@ -62,17 +62,17 @@ entities([], []) ->
 	    ?d("entities -> converted config: ~n~p", [Conf]),
 	    [{agent, Conf}]
     end;
-entities([], E) ->
+entities([], Acc) ->
     ?d("entities -> done", []),
-    lists:reverse(E);
-entities([ET|ETs], E) ->
+    lists:reverse(Acc);
+entities([Ent|Ents], Acc) ->
     ?d("entities -> entry with"
-       "~n   ET: ~p", [ET]),
-    case application:get_env(snmp, ET) of
+       "~n   Ent: ~p", [Ent]),
+    case application:get_env(snmp, Ent) of
 	{ok, Conf} ->
-	    entities(ETs, [{ET, Conf}|E]);
+	    entities(Ents, [{Ent, Conf}|Acc]);
 	_ ->
-	    entities(ETs, E)
+	    entities(Ents, Acc)
     end.
 	
 start_entities(_Type, []) ->