Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183

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

3 files changed, 26 insertions, 4 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 6853eefad2..b366f1c86d 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -35,7 +35,7 @@
   <section>
     <title>SNMP Development Toolkit 4.20</title>
     <p>Version 4.20 supports code replacement in runtime from/to
-      version 4,19 and 4.18.</p>
+      version 4.19 and 4.18.</p>
 
     <section>
       <title>Improvements and new features</title>
@@ -53,6 +53,15 @@
           <p>Aux Id: Seq 11790</p>
 	</item>
 
+
+        <item>
+          <p>[agent] To be able to handle multiple engine-id(s) when
+	  sending trap(s), the function 
+          <seealso marker="snmp_community_mib:add_community">add_community/6</seealso>
+          has been added. </p>
+          <p>Own Id: OTP-9119 Aux Id: Seq 11792</p>
+        </item>
+
         <item>
           <p>[manager] The old API functions (for get and set
 	  requests) are now officially deprecated.
@@ -74,7 +83,6 @@
           <p>Own Id: OTP-9183</p>
           <p>Aux Id: Seq 11817</p>
         </item>
-
       </list>
     </section>
 
@@ -198,6 +206,7 @@ snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
 
   </section> <!-- 4.19 -->
 
+
   <section>
     <title>SNMP Development Toolkit 4.18</title>
     <p>Version 4.18 supports code replacement in runtime from/to
diff --git a/lib/snmp/src/agent/snmp_community_mib.erl b/lib/snmp/src/agent/snmp_community_mib.erl
index 5644a43345..3debe0a30e 100644
--- a/lib/snmp/src/agent/snmp_community_mib.erl
+++ b/lib/snmp/src/agent/snmp_community_mib.erl
@@ -25,7 +25,7 @@
 	 snmpTargetAddrExtTable/3,
 	 community2vacm/2, vacm2community/2,
 	 get_target_addr_ext_mms/2]).
--export([add_community/5, delete_community/1]).
+-export([add_community/5, add_community/6, delete_community/1]).
 -export([check_community/1]).
 
 -include("SNMP-COMMUNITY-MIB.hrl").
@@ -128,12 +128,16 @@ read_community_config_files(Dir) ->
     Comms.
 
 check_community({Index, CommunityName, SecName, CtxName, TransportTag}) ->
+    EngineID = get_engine_id(),
+    check_community({Index, CommunityName, SecName, 
+		     EngineID, CtxName, TransportTag});
+check_community({Index, CommunityName, SecName, 
+		 EngineID, CtxName, TransportTag}) ->
     snmp_conf:check_string(Index,{gt,0}),
     snmp_conf:check_string(CommunityName),
     snmp_conf:check_string(SecName),
     snmp_conf:check_string(CtxName),
     snmp_conf:check_string(TransportTag),
-    EngineID = get_engine_id(),
     Comm = {Index, CommunityName, SecName, EngineID, CtxName, TransportTag,
 	    ?'StorageType_nonVolatile', ?'RowStatus_active'},
     {ok, Comm};
@@ -173,6 +177,13 @@ table_del_row(Tab, Key) ->
 %% FIXME: does not work with mnesia
 add_community(Idx, CommName, SecName, CtxName, TransportTag) ->
     Community = {Idx, CommName, SecName, CtxName, TransportTag},
+    do_add_community(Community).
+
+add_community(Idx, CommName, SecName, EngineId, CtxName, TransportTag) ->
+    Community = {Idx, CommName, SecName, EngineId, CtxName, TransportTag},
+    do_add_community(Community).
+
+do_add_community(Community) ->
     case (catch check_community(Community)) of
 	{ok, Row} ->
 	    Key = element(1, Row),
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 46b2efffca..0d99a59958 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -39,6 +39,7 @@
      [snmp_notification_mib]}, 
     {load_module, snmp_notification_mib, soft_purge, soft_purge, 
      [snmp_conf, snmp_target_mib]}, 
+    {load_module, snmp_community_mib, soft_purge, soft_purge, []}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, 
      [snmp_conf]},
     {update, snmpa_net_if, soft, soft_purge, soft_purge, 
@@ -112,6 +113,7 @@
      [snmp_notification_mib]}, 
     {load_module, snmp_notification_mib, soft_purge, soft_purge, 
      [snmp_conf, snmp_target_mib]}, 
+    {load_module, snmp_community_mib, soft_purge, soft_purge, []}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, 
      [snmp_conf]},
     {update, snmpa_net_if, soft, soft_purge, soft_purge,