From ff9bb5663760f5c1e474c8841c6683a0a5d92839 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Tue, 20 Oct 2026 14:15:53 -0500
Subject: [PATCH] Kill all federated reporting transport user processes before
 attempting to remove the user

Ticket: ENT-14770
Changelog: none
---
 cfe_internal/enterprise/federation/federation.cf | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/cfe_internal/enterprise/federation/federation.cf b/cfe_internal/enterprise/federation/federation.cf
index 7f244f4998..87ac7bd655 100644
--- a/cfe_internal/enterprise/federation/federation.cf
+++ b/cfe_internal/enterprise/federation/federation.cf
@@ -559,8 +559,16 @@ bundle agent clean_when_off
         useshell
       );
 @endif
+  processes:
+    ".*"
+      process_select => by_owner("$(user)"),
+      signals => { "kill" },
+      handle => "transport_user_procs_killed";
+
   users:
-    "$(user)" policy => "absent";
+    "$(user)"
+      policy => "absent",
+      depends_on => { "transport_user_procs_killed" };
 
   files:
     "$(cfengine_enterprise_federation:config.path_setup_status)" -> {