Merge pull request #12728 from mpurg/fix_oscap_crash_12718

Fix to prevent oscap crashing on ubuntu
ComplianceAsCode · Dec 17, 2024 · d2bd82a · d2bd82a
2 parents dfdd193 + febbda0
commit d2bd82a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
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
@@ -62,8 +62,10 @@ 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.'
 
+{{% if 'ubuntu' not in product %}}
 conflicts:
     - sshd_enable_warning_banner_net
+{{% endif %}}
 
 template:
     name: sshd_lineinfile

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,8 +46,10 @@ references:
 
 {{{ complete_ocil_entry_sshd_option(default="no", option="Banner", value="/etc/issue.net") }}}
 
+{{% if 'ubuntu' not in product %}}
 conflicts:
     - sshd_enable_warning_banner
+{{% endif %}}
 
 template:
     name: sshd_lineinfile