[agent] The SNMP ACM cache was not properly updated when

changes where made to the VACM security-to-group, access and
view-tree-family tables.

OTP-9367

Merge branch 'bmk/snmp/agent/acm_cache_cleanup/OTP-9367' into bmk/snmp/snmp421_integration

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

3 files changed, 20 insertions, 0 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 3e97658829..5530f83f17 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -85,6 +85,14 @@
 	  <p>Own Id: OTP-9354</p>
 	</item>
 
+        <item>
+          <p>[agent] The SNMP ACM cache was not properly updated when
+	  changes where made to the VACM security-to-group, access and
+	  view-tree-family tables. </p>
+	  <p>Own Id: OTP-9367</p>
+          <p>Aux Id: Seq 11858</p>
+	</item>
+
       </list>
     </section>
 
diff --git a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
index 28469a7b4e..37f6dd3f26 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -247,6 +247,7 @@ add_sec2group(SecModel, SecName, GroupName) ->
 	    Key = [Key1, length(Key2) | Key2],
 	    case table_cre_row(vacmSecurityToGroupTable, Key, Row) of
 		true ->
+		    snmpa_agent:invalidate_ca_cache(),
 		    {ok, Key};
 		false ->
 		    {error, create_failed}
@@ -260,6 +261,7 @@ add_sec2group(SecModel, SecName, GroupName) ->
 delete_sec2group(Key) ->
     case table_del_row(vacmSecurityToGroupTable, Key) of
 	true ->
+	    snmpa_agent:invalidate_ca_cache(),
 	    ok;
 	false ->
 	    {error, delete_failed}
@@ -279,6 +281,7 @@ add_access(GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV) ->
 	    Key3 = [SM, SL],
 	    Key  = Key1 ++ Key2 ++ Key3, 
 	    snmpa_vacm:insert([{Key, Row}], false),
+            snmpa_agent:invalidate_ca_cache(),
 	    {ok, Key};
 	{error, Reason} ->
 	    {error, Reason};
@@ -287,6 +290,7 @@ add_access(GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV) ->
     end.
 
 delete_access(Key) ->
+    snmpa_agent:invalidate_ca_cache(),
     snmpa_vacm:delete(Key).
 
 
@@ -299,6 +303,7 @@ add_view_tree_fam(ViewIndex, SubTree, Status, Mask) ->
 	    Key  = [length(Key1) | Key1] ++ [length(Key2) | Key2],
 	    case table_cre_row(vacmViewTreeFamilyTable, Key, Row) of
 		true ->
+		    snmpa_agent:invalidate_ca_cache(),
 		    {ok, Key};
 		false ->
 		    {error, create_failed}
@@ -312,6 +317,7 @@ add_view_tree_fam(ViewIndex, SubTree, Status, Mask) ->
 delete_view_tree_fam(Key) ->
     case table_del_row(vacmViewTreeFamilyTable, Key) of
 	true ->
+	    snmpa_agent:invalidate_ca_cache(),
 	    ok;
 	false ->
 	    {error, delete_failed}
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 2580b967ef..8e1855b4df 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -24,6 +24,7 @@
  [
   {"4.20.1", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, 
      [snmpm_server, snmpm_config, snmp_config]}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
@@ -43,6 +44,7 @@
   }, 
   {"4.20", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
     {load_module, snmpm, soft_purge, soft_purge, 
      [snmpm_server, snmpm_config, snmp_config]}, 
@@ -85,6 +87,7 @@
      [snmp_conf, snmpa_mpd, snmp_target_mib]}, 
     {load_module, snmpa_conf, soft_purge, soft_purge, 
      [snmp_config, snmp_notification_mib]}, 
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmp_notification_mib, soft_purge, soft_purge, 
      [snmp_conf, snmp_target_mib]}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, []}, 
@@ -108,6 +111,7 @@
  [
   {"4.20.1", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, 
      [snmpm_server, snmpm_config, snmp_config]}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
@@ -127,6 +131,7 @@
   }, 
   {"4.20", 
    [
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
     {load_module, snmpm, soft_purge, soft_purge, 
      [snmpm_server, snmpm_config, snmp_config]}, 
@@ -169,6 +174,7 @@
      [snmp_conf, snmpa_mpd, snmp_target_mib]}, 
     {load_module, snmpa_conf, soft_purge, soft_purge, 
      [snmp_config, snmp_notification_mib]}, 
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmp_notification_mib, soft_purge, soft_purge, 
      [snmp_conf, snmp_target_mib]}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, []},