Blame SOURCES/scap-security-guide-0.1.61-rhel8_stig_audit_rules-PR_8174.patch

ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
5fd106
index a0b3efcbf79..1bc7afbb224 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
5fd106
@@ -58,7 +58,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030410
5fd106
     stigid@ol8: OL08-00-030540
ff1465
     stigid@rhel7: RHEL-07-030420
ff1465
-    stigid@rhel8: RHEL-08-030540
ff1465
+    stigid@rhel8: RHEL-08-030490
ff1465
     stigid@sle12: SLES-12-020470
ff1465
     stigid@sle15: SLES-15-030300
ff1465
     stigid@ubuntu2004: UBTU-20-010153
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
5fd106
index 83dd57f2b6d..dc8211684f2 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
5fd106
@@ -58,7 +58,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030410
5fd106
     stigid@ol8: OL08-00-030530
ff1465
     stigid@rhel7: RHEL-07-030430
ff1465
-    stigid@rhel8: RHEL-08-030530
ff1465
+    stigid@rhel8: RHEL-08-030490
ff1465
     stigid@sle12: SLES-12-020480
5fd106
     stigid@sle15: SLES-15-030310
ff1465
     stigid@ubuntu2004: UBTU-20-010154
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
5fd106
index 1b78aab4a1a..07592bb2fd9 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
5fd106
@@ -61,7 +61,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030370
5fd106
     stigid@ol8: OL08-00-030520
ff1465
     stigid@rhel7: RHEL-07-030380
ff1465
-    stigid@rhel8: RHEL-08-030520
ff1465
+    stigid@rhel8: RHEL-08-030480
ff1465
     stigid@sle12: SLES-12-020430
ff1465
     stigid@sle15: SLES-15-030260
ff1465
     stigid@ubuntu2004: UBTU-20-010149
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
5fd106
index 360c60de06d..084970765b2 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
5fd106
@@ -58,7 +58,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030370
5fd106
     stigid@ol8: OL08-00-030510
ff1465
     stigid@rhel7: RHEL-07-030400
ff1465
-    stigid@rhel8: RHEL-08-030510
ff1465
+    stigid@rhel8: RHEL-08-030480
ff1465
     stigid@sle12: SLES-12-020450
ff1465
     stigid@sle15: SLES-15-030280
ff1465
     stigid@ubuntu2004: UBTU-20-010150
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
5fd106
index 19bf8a5b981..5695440ad7d 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
5fd106
@@ -75,7 +75,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030440
5fd106
     stigid@ol8: OL08-00-030240
ff1465
     stigid@rhel7: RHEL-07-030480
ff1465
-    stigid@rhel8: RHEL-08-030240
ff1465
+    stigid@rhel8: RHEL-08-030200
ff1465
     stigid@sle12: SLES-12-020410
ff1465
     stigid@sle15: SLES-15-030210
ff1465
     stigid@ubuntu2004: UBTU-20-010147
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
5fd106
index 40cd114042e..ab536a8ae0a 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
5fd106
@@ -70,7 +70,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030440
5fd106
     stigid@ol8: OL08-00-030230
ff1465
     stigid@rhel7: RHEL-07-030450
ff1465
-    stigid@rhel8: RHEL-08-030230
ff1465
+    stigid@rhel8: RHEL-08-030200
ff1465
     stigid@sle12: SLES-12-020380
ff1465
     stigid@sle15: SLES-15-030230
ff1465
     stigid@ubuntu2004: UBTU-20-010144
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
5fd106
index 81dddd9fb71..d1f4ee35ccb 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
5fd106
@@ -58,7 +58,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030370
5fd106
     stigid@ol8: OL08-00-030500
ff1465
     stigid@rhel7: RHEL-07-030390
ff1465
-    stigid@rhel8: RHEL-08-030500
ff1465
+    stigid@rhel8: RHEL-08-030480
ff1465
     stigid@sle12: SLES-12-020440
ff1465
     stigid@sle15: SLES-15-030270
ff1465
     stigid@ubuntu2004: UBTU-20-010151
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
5fd106
index fa15012b05f..a2425e373bc 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
5fd106
@@ -69,7 +69,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030440
5fd106
     stigid@ol8: OL08-00-030220
ff1465
     stigid@rhel7: RHEL-07-030460
ff1465
-    stigid@rhel8: RHEL-08-030220
ff1465
+    stigid@rhel8: RHEL-08-030200
ff1465
     stigid@sle15: SLES-15-030240
ff1465
     stigid@ubuntu2004: UBTU-20-010143
ff1465
     vmmsrg: SRG-OS-000458-VMM-001810,SRG-OS-000474-VMM-001940
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
5fd106
index 6d15eecee2c..0be27fbe860 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
5fd106
@@ -74,7 +74,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030440
5fd106
     stigid@ol8: OL08-00-030210
ff1465
     stigid@rhel7: RHEL-07-030470
ff1465
-    stigid@rhel8: RHEL-08-030210
ff1465
+    stigid@rhel8: RHEL-08-030200
ff1465
     stigid@sle12: SLES-12-020390
ff1465
     stigid@sle15: SLES-15-030190
ff1465
     stigid@ubuntu2004: UBTU-20-010145
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
5fd106
index 6f7cea26e16..5dc13a0a43a 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
5fd106
@@ -70,7 +70,7 @@ references:
ff1465
     stigid@ol7: OL07-00-030440
5fd106
     stigid@ol8: OL08-00-030270
ff1465
     stigid@rhel7: RHEL-07-030440
ff1465
-    stigid@rhel8: RHEL-08-030270
ff1465
+    stigid@rhel8: RHEL-08-030200
ff1465
     stigid@sle12: SLES-12-020370
ff1465
     stigid@sle15: SLES-15-030220
ff1465
     stigid@ubuntu2004: UBTU-20-010142
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
5fd106
index 718dcb8a9d9..120d6fa84d3 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
5fd106
@@ -52,7 +52,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030910
5fd106
     stigid@ol8: OL08-00-030362
ff1465
     stigid@rhel7: RHEL-07-030890
ff1465
-    stigid@rhel8: RHEL-08-030362
ff1465
+    stigid@rhel8: RHEL-08-030361
ff1465
     stigid@ubuntu2004: UBTU-20-010270
ff1465
     vmmsrg: SRG-OS-000466-VMM-001870,SRG-OS-000468-VMM-001890
ff1465
 
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
5fd106
index 643f075f46a..4caa7c66986 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
5fd106
@@ -49,7 +49,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030910
5fd106
     stigid@ol8: OL08-00-030363
ff1465
     stigid@rhel7: RHEL-07-030900
ff1465
-    stigid@rhel8: RHEL-08-030363
ff1465
+    stigid@rhel8: RHEL-08-030361
ff1465
     vmmsrg: SRG-OS-000466-VMM-001870,SRG-OS-000468-VMM-001890
ff1465
 
ff1465
 {{{ complete_ocil_entry_audit_syscall(syscall="rmdir") }}}
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
5fd106
index 9cf3c4668bc..8fea9dc4582 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
5fd106
@@ -52,7 +52,7 @@ references:
ff1465
     stigid@ol7: OL07-00-030910
5fd106
     stigid@ol8: OL08-00-030364
ff1465
     stigid@rhel7: RHEL-07-030910
ff1465
-    stigid@rhel8: RHEL-08-030364
ff1465
+    stigid@rhel8: RHEL-08-030361
ff1465
     stigid@ubuntu2004: UBTU-20-010267
ff1465
     vmmsrg: SRG-OS-000466-VMM-001870,SRG-OS-000468-VMM-001890
ff1465
 
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
5fd106
index d0ebbdbd723..bee18e99b52 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
5fd106
@@ -52,7 +52,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030910
5fd106
     stigid@ol8: OL08-00-030365
ff1465
     stigid@rhel7: RHEL-07-030920
ff1465
-    stigid@rhel8: RHEL-08-030365
ff1465
+    stigid@rhel8: RHEL-08-030361
ff1465
     stigid@ubuntu2004: UBTU-20-010268
ff1465
     vmmsrg: SRG-OS-000466-VMM-001870,SRG-OS-000468-VMM-001890
ff1465
 
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
5fd106
index 373b12525e1..736c6643b57 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
5fd106
@@ -63,7 +63,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030510
5fd106
     stigid@ol8: OL08-00-030470
ff1465
     stigid@rhel7: RHEL-07-030500
ff1465
-    stigid@rhel8: RHEL-08-030470
ff1465
+    stigid@rhel8: RHEL-08-030420
ff1465
     stigid@sle12: SLES-12-020520
ff1465
     stigid@sle15: SLES-15-030160
ff1465
     stigid@ubuntu2004: UBTU-20-010158
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
5fd106
index 2b2d82a736b..6b4176d53e3 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
5fd106
@@ -66,7 +66,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030510
5fd106
     stigid@ol8: OL08-00-030460
ff1465
     stigid@rhel7: RHEL-07-030550
ff1465
-    stigid@rhel8: RHEL-08-030460
ff1465
+    stigid@rhel8: RHEL-08-030420
ff1465
     stigid@sle12: SLES-12-020510
ff1465
     stigid@sle15: SLES-15-030320
ff1465
     stigid@ubuntu2004: UBTU-20-010157
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
5fd106
index dcb3d0f0525..90d45b6787e 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
5fd106
@@ -66,7 +66,7 @@ references:
ff1465
     stigid@ol7: OL07-00-030510
5fd106
     stigid@ol8: OL08-00-030440
ff1465
     stigid@rhel7: RHEL-07-030510
ff1465
-    stigid@rhel8: RHEL-08-030440
ff1465
+    stigid@rhel8: RHEL-08-030420
ff1465
     stigid@sle12: SLES-12-020490
ff1465
     stigid@sle15: SLES-15-030150
ff1465
     stigid@ubuntu2004: UBTU-20-010155
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
5fd106
index e68d892bb90..6df936e489c 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
5fd106
@@ -60,7 +60,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030510
5fd106
     stigid@ol8: OL08-00-030450
ff1465
     stigid@rhel7: RHEL-07-030530
ff1465
-    stigid@rhel8: RHEL-08-030450
ff1465
+    stigid@rhel8: RHEL-08-030420
ff1465
     stigid@sle12: SLES-12-020540
ff1465
     stigid@sle15: SLES-15-030180
ff1465
     stigid@ubuntu2004: UBTU-20-010160
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
5fd106
index cd6bd545e71..1b6ae818e48 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
5fd106
@@ -66,7 +66,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030510
5fd106
     stigid@ol8: OL08-00-030430
ff1465
     stigid@rhel7: RHEL-07-030520
ff1465
-    stigid@rhel8: RHEL-08-030430
ff1465
+    stigid@rhel8: RHEL-08-030420
ff1465
     stigid@sle12: SLES-12-020530
ff1465
     stigid@sle15: SLES-15-030170
ff1465
     stigid@ubuntu2004: UBTU-20-010159
ff1465
diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
5fd106
index 50e5b4e4f02..2f1c6d0bf22 100644
ff1465
--- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
ff1465
+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
5fd106
@@ -51,7 +51,7 @@ references:
5fd106
     stigid@ol7: OL07-00-030820
5fd106
     stigid@ol8: OL08-00-030380
ff1465
     stigid@rhel7: RHEL-07-030821
ff1465
-    stigid@rhel8: RHEL-08-030380
ff1465
+    stigid@rhel8: RHEL-08-030360
ff1465
     stigid@sle12: SLES-12-020740
ff1465
     stigid@sle15: SLES-15-030530
ff1465
     stigid@ubuntu2004: UBTU-20-010180
ff1465
diff --git a/products/rhel8/profiles/stig.profile b/products/rhel8/profiles/stig.profile
5fd106
index ffca983d0bd..d92bc72971c 100644
ff1465
--- a/products/rhel8/profiles/stig.profile
ff1465
+++ b/products/rhel8/profiles/stig.profile
5fd106
@@ -560,6 +560,8 @@ selections:
5fd106
 
5fd106
     # RHEL-08-020220
5fd106
     - accounts_password_pam_pwhistory_remember_system_auth
5fd106
+
5fd106
+    # RHEL-08-020221
5fd106
     - accounts_password_pam_pwhistory_remember_password_auth
5fd106
 
5fd106
     # RHEL-08-020230
5fd106
@@ -712,18 +714,11 @@ selections:
5fd106
 
5fd106
     # RHEL-08-030200
5fd106
     - audit_rules_dac_modification_lremovexattr
5fd106
-
5fd106
-    # RHEL-08-030210
5fd106
     - audit_rules_dac_modification_removexattr
5fd106
-
5fd106
-    # RHEL-08-030220
5fd106
     - audit_rules_dac_modification_lsetxattr
5fd106
-
5fd106
-    # RHEL-08-030230
5fd106
     - audit_rules_dac_modification_fsetxattr
5fd106
-
5fd106
-    # RHEL-08-030240
5fd106
     - audit_rules_dac_modification_fremovexattr
5fd106
+    - audit_rules_dac_modification_setxattr
5fd106
 
5fd106
     # RHEL-08-030250
5fd106
     - audit_rules_privileged_commands_chage
5fd106
@@ -731,8 +726,6 @@ selections:
5fd106
     # RHEL-08-030260
5fd106
     - audit_rules_execution_chcon
5fd106
 
5fd106
-    # RHEL-08-030270
5fd106
-    - audit_rules_dac_modification_setxattr
5fd106
 
5fd106
     # RHEL-08-030280
5fd106
     - audit_rules_privileged_commands_ssh_agent
5fd106
@@ -787,28 +780,18 @@ selections:
5fd106
 
5fd106
     # RHEL-08-030360
5fd106
     - audit_rules_kernel_module_loading_init
5fd106
+    - audit_rules_kernel_module_loading_finit
5fd106
 
5fd106
     # RHEL-08-030361
5fd106
     - audit_rules_file_deletion_events_rename
5fd106
-
5fd106
-    # RHEL-08-030362
5fd106
     - audit_rules_file_deletion_events_renameat
5fd106
-
5fd106
-    # RHEL-08-030363
5fd106
     - audit_rules_file_deletion_events_rmdir
5fd106
-
5fd106
-    # RHEL-08-030364
5fd106
     - audit_rules_file_deletion_events_unlink
5fd106
-
5fd106
-    # RHEL-08-030365
5fd106
     - audit_rules_file_deletion_events_unlinkat
5fd106
 
5fd106
     # RHEL-08-030370
5fd106
     - audit_rules_privileged_commands_gpasswd
5fd106
 
5fd106
-    # RHEL-08-030380
5fd106
-    - audit_rules_kernel_module_loading_finit
5fd106
-
5fd106
     # RHEL-08-030390
5fd106
     - audit_rules_kernel_module_loading_delete
5fd106
 
5fd106
@@ -820,41 +803,21 @@ selections:
5fd106
 
5fd106
     # RHEL-08-030420
5fd106
     - audit_rules_unsuccessful_file_modification_truncate
5fd106
-
5fd106
-    # RHEL-08-030430
5fd106
     - audit_rules_unsuccessful_file_modification_openat
5fd106
-
5fd106
-    # RHEL-08-030440
5fd106
     - audit_rules_unsuccessful_file_modification_open
5fd106
-
5fd106
-    # RHEL-08-030450
5fd106
     - audit_rules_unsuccessful_file_modification_open_by_handle_at
5fd106
-
5fd106
-    # RHEL-08-030460
5fd106
     - audit_rules_unsuccessful_file_modification_ftruncate
5fd106
-
5fd106
-    # RHEL-08-030470
5fd106
     - audit_rules_unsuccessful_file_modification_creat
5fd106
 
5fd106
     # RHEL-08-030480
5fd106
     - audit_rules_dac_modification_chown
5fd106
-
5fd106
-    # RHEL-08-030490
5fd106
-    - audit_rules_dac_modification_chmod
5fd106
-
5fd106
-    # RHEL-08-030500
5fd106
     - audit_rules_dac_modification_lchown
5fd106
-
5fd106
-    # RHEL-08-030510
5fd106
     - audit_rules_dac_modification_fchownat
5fd106
-
5fd106
-    # RHEL-08-030520
5fd106
     - audit_rules_dac_modification_fchown
5fd106
 
5fd106
-    # RHEL-08-030530
5fd106
+    # RHEL-08-030490
5fd106
+    - audit_rules_dac_modification_chmod
5fd106
     - audit_rules_dac_modification_fchmodat
5fd106
-
5fd106
-    # RHEL-08-030540
5fd106
     - audit_rules_dac_modification_fchmod
5fd106
 
5fd106
     # RHEL-08-030550
5fd106
diff --git a/products/rhel9/profiles/stig.profile b/products/rhel9/profiles/stig.profile
5fd106
index eb2cac913bd..42c6d0e9aca 100644
5fd106
--- a/products/rhel9/profiles/stig.profile
5fd106
+++ b/products/rhel9/profiles/stig.profile
ff1465
@@ -561,6 +561,8 @@ selections:
ff1465
 
ff1465
     # RHEL-08-020220
ff1465
     - accounts_password_pam_pwhistory_remember_system_auth
ff1465
+
ff1465
+    # RHEL-08-020221
ff1465
     - accounts_password_pam_pwhistory_remember_password_auth
ff1465
 
ff1465
     # RHEL-08-020230
ff1465
@@ -713,18 +715,11 @@ selections:
ff1465
 
ff1465
     # RHEL-08-030200
ff1465
     - audit_rules_dac_modification_lremovexattr
ff1465
-
ff1465
-    # RHEL-08-030210
ff1465
     - audit_rules_dac_modification_removexattr
ff1465
-
ff1465
-    # RHEL-08-030220
ff1465
     - audit_rules_dac_modification_lsetxattr
ff1465
-
ff1465
-    # RHEL-08-030230
ff1465
     - audit_rules_dac_modification_fsetxattr
ff1465
-
ff1465
-    # RHEL-08-030240
ff1465
     - audit_rules_dac_modification_fremovexattr
ff1465
+    - audit_rules_dac_modification_setxattr
ff1465
 
ff1465
     # RHEL-08-030250
ff1465
     - audit_rules_privileged_commands_chage
5fd106
@@ -732,9 +727,6 @@ selections:
ff1465
     # RHEL-08-030260
ff1465
     - audit_rules_execution_chcon
ff1465
 
ff1465
-    # RHEL-08-030270
ff1465
-    - audit_rules_dac_modification_setxattr
5fd106
-
ff1465
     # RHEL-08-030280
ff1465
     - audit_rules_privileged_commands_ssh_agent
5fd106
 
5fd106
@@ -788,28 +780,18 @@ selections:
ff1465
 
ff1465
     # RHEL-08-030360
ff1465
     - audit_rules_kernel_module_loading_init
ff1465
+    - audit_rules_kernel_module_loading_finit
ff1465
 
ff1465
     # RHEL-08-030361
ff1465
     - audit_rules_file_deletion_events_rename
ff1465
-
ff1465
-    # RHEL-08-030362
ff1465
     - audit_rules_file_deletion_events_renameat
ff1465
-
ff1465
-    # RHEL-08-030363
ff1465
     - audit_rules_file_deletion_events_rmdir
ff1465
-
ff1465
-    # RHEL-08-030364
ff1465
     - audit_rules_file_deletion_events_unlink
ff1465
-
ff1465
-    # RHEL-08-030365
ff1465
     - audit_rules_file_deletion_events_unlinkat
ff1465
 
ff1465
     # RHEL-08-030370
ff1465
     - audit_rules_privileged_commands_gpasswd
ff1465
 
ff1465
-    # RHEL-08-030380
ff1465
-    - audit_rules_kernel_module_loading_finit
ff1465
-
ff1465
     # RHEL-08-030390
ff1465
     - audit_rules_kernel_module_loading_delete
ff1465
 
5fd106
@@ -821,41 +803,21 @@ selections:
ff1465
 
ff1465
     # RHEL-08-030420
ff1465
     - audit_rules_unsuccessful_file_modification_truncate
ff1465
-
ff1465
-    # RHEL-08-030430
ff1465
     - audit_rules_unsuccessful_file_modification_openat
ff1465
-
ff1465
-    # RHEL-08-030440
ff1465
     - audit_rules_unsuccessful_file_modification_open
ff1465
-
ff1465
-    # RHEL-08-030450
ff1465
     - audit_rules_unsuccessful_file_modification_open_by_handle_at
ff1465
-
ff1465
-    # RHEL-08-030460
ff1465
     - audit_rules_unsuccessful_file_modification_ftruncate
ff1465
-
ff1465
-    # RHEL-08-030470
ff1465
     - audit_rules_unsuccessful_file_modification_creat
ff1465
 
ff1465
     # RHEL-08-030480
ff1465
     - audit_rules_dac_modification_chown
ff1465
-
ff1465
-    # RHEL-08-030490
ff1465
-    - audit_rules_dac_modification_chmod
ff1465
-
ff1465
-    # RHEL-08-030500
ff1465
     - audit_rules_dac_modification_lchown
ff1465
-
ff1465
-    # RHEL-08-030510
ff1465
     - audit_rules_dac_modification_fchownat
ff1465
-
ff1465
-    # RHEL-08-030520
ff1465
     - audit_rules_dac_modification_fchown
ff1465
 
ff1465
-    # RHEL-08-030530
ff1465
+    # RHEL-08-030490
ff1465
+    - audit_rules_dac_modification_chmod
ff1465
     - audit_rules_dac_modification_fchmodat
ff1465
-
ff1465
-    # RHEL-08-030540
ff1465
     - audit_rules_dac_modification_fchmod
ff1465
 
ff1465
     # RHEL-08-030550