Skip to content

Commit

Permalink
Minor typo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
alanmcanonical committed Jan 10, 2025
1 parent 4f13509 commit 4e167a8
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<criteria comment="sshd is configured correctly or is not installed" operator="OR">
{{{- application_not_required_or_requirement_unset() }}}
{{{- application_required_or_requirement_unset() }}}
<criteria comment="sshd is configured corectly" operator="OR">
<criteria comment="sshd is configured correctly" operator="OR">
{{{- oval_line_in_file_criterion(sshd_config_path, parameter) }}}
{{%- if sshd_distributed_config == "true" %}}
{{{- oval_line_in_directory_criterion(sshd_config_dir, parameter) | indent(8) }}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$control_flag\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$control_flag\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\$1control_flag\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\$1control_flag\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$control_flag\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$control_flag\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\$1control_flag\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if grep -q "^password.*pam_pwhistory\.so.*" $config_file; then
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*$control_flag.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\$1control_flag\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ do
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*requisite.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1requisite\3/" $config_file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ do
# option is set, replace value
sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$remember_cnt\3/" $config_file
fi
# ensure corect control is being used per os requirement
# ensure correct control is being used per os requirement
if ! grep -q "^password.*requisite.*pam_pwhistory\.so.*" $config_file; then
#replace incorrect value
sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1requisite\3/" $config_file
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/ssg-module/data/controls_dir/abcd-levels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ controls:
- var_password_pam_minlen=2
- var_some_variable=3

# S5, S6 and S7 are used to test if level inheritance is working corectly
# S5, S6 and S7 are used to test if level inheritance is working correctly
# when multiple levels select the same rule
- id: S5
title: Default Crypto Policy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<oval-def:criteria comment="sshd is installed and configured" operator="AND">
<oval-def:extend_definition comment="sshd is required or requirement is unset" definition_ref="oval:ssg-sshd_required_or_unset:def:1" />
<oval-def:extend_definition comment="rpm package openssh-server installed" definition_ref="oval:ssg-package_openssh-server_installed:def:1" />
<oval-def:criteria comment="sshd is configured corectly" operator="OR">
<oval-def:criteria comment="sshd is configured correctly" operator="OR">
<oval-def:criterion comment="Check the RekeyLimit in /etc/ssh/sshd_config" test_ref="oval:ssg-test_sshd_rekey_limit:tst:1" />
<oval-def:criterion comment="Check the RekeyLimit in /etc/ssh/sshd_config.d" test_ref="oval:ssg-test_sshd_rekey_limit_config_dir:tst:1" />
</oval-def:criteria>
Expand Down

0 comments on commit 4e167a8

Please sign in to comment.