Skip to content

Commit

Permalink
Fix to prevent oscap crashing on ubuntu
Browse files Browse the repository at this point in the history
The recently added conflicts tags to sshd_enable_warning_banner_*
rules cause openscap to crash on Ubuntu (#12718).

This change disables the conflicts tags on Ubuntu products
until a proper fix is implemented.
  • Loading branch information
mpurg committed Dec 16, 2024
1 parent 0b16615 commit febbda0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit febbda0

Please sign in to comment.