From cfb4cc3b3712df5e4c5905ea864f9af43de38288 Mon Sep 17 00:00:00 2001
From: Eduardo Barretto <eduardo.barretto@canonical.com>
Date: Wed, 18 Dec 2024 11:52:00 +0100
Subject: [PATCH] Fix mistake done in PR #12714

---
 controls/cis_ubuntu2404.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/controls/cis_ubuntu2404.yml b/controls/cis_ubuntu2404.yml
index f61428e3a8d..3ba3a970c19 100644
--- a/controls/cis_ubuntu2404.yml
+++ b/controls/cis_ubuntu2404.yml
@@ -33,7 +33,7 @@ controls:
     rules:
       - kernel_module_freevxfs_disabled
     status: automated
-    
+
   - id: 1.1.1.3
     title: Ensure hfs kernel module is not available (Automated)
     levels:
@@ -374,7 +374,7 @@ controls:
       - package_apparmor_installed
       - package_apparmor-utils_installed
     status: automated
-    
+
   - id: 1.3.1.2
     title: Ensure AppArmor is enabled in the bootloader configuration (Automated)
     levels:
@@ -668,7 +668,7 @@ controls:
       - service_autofs_disabled
       - package_autofs_removed
     status: automated
-    
+
   - id: 2.1.2
     title: Ensure avahi daemon services are not in use (Automated)
     levels:
@@ -1618,8 +1618,9 @@ controls:
     levels:
       - l1_workstation
       - l2_server
-    status: planned
-    notes: TODO. Rule does not seem to be implemented, nor does it map to any rules in ubuntu2204 profile.
+    rules:
+      - sshd_disable_forwarding
+    status: automated
 
   - id: 5.1.9
     title: Ensure sshd GSSAPIAuthentication is disabled (Automated)
@@ -1629,7 +1630,7 @@ controls:
     rules:
       - sshd_disable_gssapi_auth
     status: automated
-    
+
   - id: 5.1.10
     title: Ensure sshd HostbasedAuthentication is disabled (Automated)
     levels: