Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix regex of sshd_set_keealive #10706

Closed
wants to merge 1 commit into from
Closed

Fix regex of sshd_set_keealive #10706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<criteria operator="AND" comment="sshd is not required and not installed">
<extend_definition definition_ref="sshd_not_required_or_unset"
comment="sshd is not required or requirement is unset"/>
{{% if product in ['opensuse', 'sle12'] %}}
{{% if product in ['opensuse', 'sle12', 'sle15'] %}}
<extend_definition definition_ref="package_openssh_removed"
comment="rpm package openssh removed"/>
{{% else %}}
Expand All @@ -17,7 +17,7 @@
<criteria operator="AND" comment="sshd is installed and configured">
<extend_definition definition_ref="sshd_required_or_unset"
comment="sshd is required or requirement is unset"/>
{{% if product in ['opensuse', 'sle12'] %}}
{{% if product in ['opensuse', 'sle12', 'sle15'] %}}
<extend_definition definition_ref="package_openssh_installed"
comment="rpm package openssh installed"/>
{{% else %}}
Expand Down Expand Up @@ -45,7 +45,7 @@

<ind:textfilecontent54_object id="object_sshd_set_keepalive_clientalivecountmax" version="2">
<ind:filepath>/etc/ssh/sshd_config</ind:filepath>
<ind:pattern operation="pattern match">^[\s]*(?i)ClientAliveCountMax[\s]+([\d]+)[\s]*(?:#.*)?$</ind:pattern>
<ind:pattern operation="pattern match">^[ \t]*(?i)ClientAliveCountMax(?-i)[ \t]+(.+?)[ \t]*(?:$|#)</ind:pattern>
<ind:instance operation="greater than or equal" datatype="int">1</ind:instance>
</ind:textfilecontent54_object>

Expand All @@ -65,7 +65,7 @@
<ind:textfilecontent54_object id="object_sshd_set_keepalive_clientalivecountmax_dir" version="2">
<ind:path>/etc/ssh/sshd_config.d</ind:path>
<ind:filename operation="pattern match">.*\.conf$</ind:filename>
<ind:pattern operation="pattern match">^[\s]*(?i)ClientAliveCountMax[\s]+([\d]+)[\s]*(?:#.*)?$</ind:pattern>
<ind:pattern operation="pattern match">^[ \t]*(?i)ClientAliveCountMax(?-i)[ \t]+(.+?)[ \t]*(?:$|#)</ind:pattern>
<ind:instance operation="greater than or equal" datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
{{%- endif %}}
Expand Down