[nrf toup] Use cleanup flag for fabric delete in FailSafeCleanup

Cleanup all (even when incomplete) fabric data. Signed-off-by: Adrian Gielniewski <[email protected]>
nrfconnect · Feb 25, 2025 · 595ef2b · 595ef2b
1 parent 98fadfe
commit 595ef2b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
@@ -268,9 +268,9 @@ const FabricInfo * RetrieveCurrentFabric(CommandHandler * aCommandHandler)
     return Server::GetInstance().GetFabricTable().FindFabricWithIndex(index);
 }
 
-CHIP_ERROR DeleteFabricFromTable(FabricIndex fabricIndex)
+CHIP_ERROR DeleteFabricFromTable(FabricIndex fabricIndex, bool cleanup = false)
 {
-    ReturnErrorOnFailure(Server::GetInstance().GetFabricTable().Delete(fabricIndex));
+    ReturnErrorOnFailure(Server::GetInstance().GetFabricTable().Delete(fabricIndex, cleanup));
     return CHIP_NO_ERROR;
 }
 
@@ -303,7 +303,7 @@ void FailSafeCleanup(const chip::DeviceLayer::ChipDeviceEvent * event)
     if (event->FailSafeTimerExpired.addNocCommandHasBeenInvoked)
     {
         CHIP_ERROR err;
-        err = DeleteFabricFromTable(fabricIndex);
+        err = DeleteFabricFromTable(fabricIndex, true);
         if (err != CHIP_NO_ERROR)
         {
             ChipLogError(Zcl, "OpCreds: failed to delete fabric at index %u: %" CHIP_ERROR_FORMAT, fabricIndex, err.Format());