Blame SOURCES/scap-security-guide-0.1.61-remove_client_alive_max-PR_8197.patch

ff1465
diff --git a/products/rhel8/profiles/stig.profile b/products/rhel8/profiles/stig.profile
5fd106
index d92bc72971c..98cabee38dd 100644
ff1465
--- a/products/rhel8/profiles/stig.profile
ff1465
+++ b/products/rhel8/profiles/stig.profile
5fd106
@@ -51,7 +51,7 @@ selections:
ff1465
     - var_password_pam_lcredit=1
ff1465
     - var_password_pam_retry=3
ff1465
     - var_password_pam_minlen=15
ff1465
-    - var_sshd_set_keepalive=0
ff1465
+    # - var_sshd_set_keepalive=0
ff1465
     - sshd_approved_macs=stig
ff1465
     - sshd_approved_ciphers=stig
ff1465
     - sshd_idle_timeout_value=10_minutes
5fd106
@@ -170,11 +170,13 @@ selections:
5fd106
     # RHEL-08-010190
5fd106
     - dir_perms_world_writable_sticky_bits
5fd106
 
5fd106
-    # RHEL-08-010200
5fd106
-    - sshd_set_keepalive_0
5fd106
-
5fd106
-    # RHEL-08-010201
5fd106
-    - sshd_set_idle_timeout
5fd106
+    # These two items don't behave as they used to in RHEL8.6 and RHEL9
5fd106
+    # anymore. They will be disabled for now until an alternative
5fd106
+    # solution is found.
5fd106
+    # # RHEL-08-010200
5fd106
+    # - sshd_set_keepalive_0
5fd106
+    # # RHEL-08-010201
5fd106
+    # - sshd_set_idle_timeout
5fd106
 
5fd106
     # RHEL-08-010210
5fd106
     - file_permissions_var_log_messages
5fd106
diff --git a/products/rhel9/profiles/stig.profile b/products/rhel9/profiles/stig.profile
5fd106
index 42c6d0e9aca..842f17c7021 100644
5fd106
--- a/products/rhel9/profiles/stig.profile
5fd106
+++ b/products/rhel9/profiles/stig.profile
5fd106
@@ -52,7 +52,7 @@ selections:
5fd106
     - var_password_pam_lcredit=1
5fd106
     - var_password_pam_retry=3
5fd106
     - var_password_pam_minlen=15
5fd106
-    - var_sshd_set_keepalive=0
5fd106
+    # - var_sshd_set_keepalive=0
5fd106
     - sshd_approved_macs=stig
5fd106
     - sshd_approved_ciphers=stig
5fd106
     - sshd_idle_timeout_value=10_minutes
5fd106
@@ -171,11 +171,13 @@ selections:
ff1465
     # RHEL-08-010190
ff1465
     - dir_perms_world_writable_sticky_bits
ff1465
 
ff1465
-    # RHEL-08-010200
ff1465
-    - sshd_set_keepalive_0
ff1465
-
ff1465
-    # RHEL-08-010201
ff1465
-    - sshd_set_idle_timeout
ff1465
+    # These two items don't behave as they used to in RHEL8.6 and RHEL9
ff1465
+    # anymore. They will be disabled for now until an alternative
ff1465
+    # solution is found.
ff1465
+    # # RHEL-08-010200
ff1465
+    # - sshd_set_keepalive_0
ff1465
+    # # RHEL-08-010201
ff1465
+    # - sshd_set_idle_timeout
ff1465
 
ff1465
     # RHEL-08-010210
ff1465
     - file_permissions_var_log_messages
ff1465
diff --git a/tests/data/profile_stability/rhel8/stig.profile b/tests/data/profile_stability/rhel8/stig.profile
5fd106
index e4fee44f9f9..e3c8ebfc9a5 100644
ff1465
--- a/tests/data/profile_stability/rhel8/stig.profile
ff1465
+++ b/tests/data/profile_stability/rhel8/stig.profile
5fd106
@@ -353,8 +353,6 @@ selections:
ff1465
 - sshd_enable_warning_banner
ff1465
 - sshd_print_last_log
ff1465
 - sshd_rekey_limit
ff1465
-- sshd_set_idle_timeout
ff1465
-- sshd_set_keepalive_0
ff1465
 - sshd_use_strong_rng
ff1465
 - sshd_x11_use_localhost
ff1465
 - sssd_certificate_verification
5fd106
@@ -423,7 +421,6 @@ selections:
ff1465
 - var_password_pam_ucredit=1
ff1465
 - var_password_pam_lcredit=1
ff1465
 - var_password_pam_retry=3
ff1465
-- var_sshd_set_keepalive=0
ff1465
 - sshd_approved_macs=stig
ff1465
 - sshd_approved_ciphers=stig
ff1465
 - sshd_idle_timeout_value=10_minutes
ff1465
diff --git a/tests/data/profile_stability/rhel8/stig_gui.profile b/tests/data/profile_stability/rhel8/stig_gui.profile
5fd106
index 83d04775e3a..8ef48e0654b 100644
ff1465
--- a/tests/data/profile_stability/rhel8/stig_gui.profile
ff1465
+++ b/tests/data/profile_stability/rhel8/stig_gui.profile
5fd106
@@ -364,8 +364,6 @@ selections:
ff1465
 - sshd_enable_warning_banner
ff1465
 - sshd_print_last_log
ff1465
 - sshd_rekey_limit
ff1465
-- sshd_set_idle_timeout
ff1465
-- sshd_set_keepalive_0
ff1465
 - sshd_use_strong_rng
ff1465
 - sshd_x11_use_localhost
ff1465
 - sssd_certificate_verification
5fd106
@@ -432,7 +430,6 @@ selections:
ff1465
 - var_password_pam_ucredit=1
ff1465
 - var_password_pam_lcredit=1
ff1465
 - var_password_pam_retry=3
ff1465
-- var_sshd_set_keepalive=0
ff1465
 - sshd_approved_macs=stig
ff1465
 - sshd_approved_ciphers=stig
ff1465
 - sshd_idle_timeout_value=10_minutes