Merge pull request #12534 from ggbecker/update-hipaa

Remove `sshd_enable_warning_banner_net` from HIPAA control file
ComplianceAsCode · Oct 24, 2024 · face9b1 · face9b1
2 parents 04a7fa4 + 44b40aa
commit face9b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/controls/hipaa.yml b/controls/hipaa.yml
@@ -368,7 +368,6 @@ controls:
             - sshd_do_not_permit_user_env
             - sshd_enable_strictmodes
             - sshd_enable_warning_banner
-            - sshd_enable_warning_banner_net
             - sshd_set_keepalive
             - sshd_set_keepalive_0
             - sshd_use_priv_separation
@@ -639,7 +638,6 @@ controls:
             - sshd_do_not_permit_user_env
             - sshd_enable_strictmodes
             - sshd_enable_warning_banner
-            - sshd_enable_warning_banner_net
             - sshd_set_keepalive
             - var_sshd_set_keepalive=1
             - sshd_use_approved_ciphers
@@ -708,7 +706,6 @@ controls:
             - sshd_do_not_permit_user_env
             - sshd_enable_strictmodes
             - sshd_enable_warning_banner
-            - sshd_enable_warning_banner_net
             - sshd_set_keepalive
             - sshd_set_keepalive_0
             - sshd_use_priv_separation
@@ -906,7 +903,6 @@ controls:
             - sshd_do_not_permit_user_env
             - sshd_enable_strictmodes
             - sshd_enable_warning_banner
-            - sshd_enable_warning_banner_net
             - sshd_set_keepalive
             - sshd_set_keepalive_0
             - sshd_use_priv_separation
@@ -1675,7 +1671,6 @@ controls:
             - sshd_do_not_permit_user_env
             - sshd_enable_strictmodes
             - sshd_enable_warning_banner
-            - sshd_enable_warning_banner_net
             - sshd_set_keepalive
             - sshd_set_keepalive_0
             - sshd_use_approved_ciphers
@@ -1749,7 +1744,6 @@ controls:
             - sshd_do_not_permit_user_env
             - sshd_enable_strictmodes
             - sshd_enable_warning_banner
-            - sshd_enable_warning_banner_net
             - sshd_set_keepalive
             - sshd_set_keepalive_0
             - sshd_use_approved_ciphers

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner/rule.yml
@@ -61,6 +61,9 @@ fixtext: |-
 
 srg_requirement: '{{{ full_name }}} must display the Standard Mandatory DoD Notice and Consent Banner before granting local or remote access to the system via a ssh logon.'
 
+conflicts:
+    - sshd_enable_warning_banner_net
+
 template:
     name: sshd_lineinfile
     vars:

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner_net/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner_net/rule.yml
@@ -46,6 +46,9 @@ references:
 
 {{{ complete_ocil_entry_sshd_option(default="no", option="Banner", value="/etc/issue.net") }}}
 
+conflicts:
+    - sshd_enable_warning_banner
+
 template:
     name: sshd_lineinfile
     vars: