Merge pull request #12785 from alanmcanonical/typo_fix

Minor typo fix
ComplianceAsCode · Jan 14, 2025 · a0d20a3 · a0d20a3
2 parents 08671ed + 4e167a8
commit a0d20a3
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/oval/shared.xml b/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/oval/shared.xml
@@ -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) }}}

diff --git a/...tempts/accounts_password_pam_pwhistory_remember_password_auth/tests/correct_value.pass.sh b/...tempts/accounts_password_pam_pwhistory_remember_password_auth/tests/correct_value.pass.sh
@@ -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

diff --git a/...ts_password_pam_pwhistory_remember_password_auth/tests/rhel7_correct_value_cis_l2.pass.sh b/...ts_password_pam_pwhistory_remember_password_auth/tests/rhel7_correct_value_cis_l2.pass.sh
@@ -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

diff --git a/...tempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_control.fail.sh b/...tempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_control.fail.sh
@@ -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

diff --git a/...attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_value.fail.sh b/...attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/wrong_value.fail.sh
@@ -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

diff --git a/...attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/correct_value.pass.sh b/...attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/correct_value.pass.sh
@@ -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

diff --git a/...unts_password_pam_pwhistory_remember_system_auth/tests/rhel7_correct_value_cis_l2.pass.sh b/...unts_password_pam_pwhistory_remember_system_auth/tests/rhel7_correct_value_cis_l2.pass.sh
@@ -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

diff --git a/...attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_control.fail.sh b/...attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_control.fail.sh
@@ -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

diff --git a/...d_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_value.fail.sh b/...d_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/wrong_value.fail.sh
@@ -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

diff --git a/...ing_out_password_attempts/accounts_password_pam_unix_remember/tests/correct_value.pass.sh b/...ing_out_password_attempts/accounts_password_pam_unix_remember/tests/correct_value.pass.sh
@@ -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

diff --git a/...cking_out_password_attempts/accounts_password_pam_unix_remember/tests/wrong_value.fail.sh b/...cking_out_password_attempts/accounts_password_pam_unix_remember/tests/wrong_value.fail.sh
@@ -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

diff --git a/tests/unit/ssg-module/data/controls_dir/abcd-levels.yml b/tests/unit/ssg-module/data/controls_dir/abcd-levels.yml
@@ -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

diff --git a/tests/unit/ssg-module/data/minimal_oval_of_oval_ssg-sshd_rekey_limit_def.xml b/tests/unit/ssg-module/data/minimal_oval_of_oval_ssg-sshd_rekey_limit_def.xml
@@ -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>