From 9d5e1edb9580432c2f650cae66bab55e533d2a3d Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 12 Feb 2023 18:48:46 +0100
Subject: [PATCH] VPN: IPsec: Connections - missing remapping pool uuid to
 name, closes https://github.com/opnsense/core/issues/6324

---
 src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.php b/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.php
index 8264e2721..57125381a 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.php
+++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.php
@@ -192,6 +192,16 @@ class Swanctl extends BaseModel
                 }
             }
         }
+        if (!empty($data['pools'])) {
+            // pools are mapped by name for clearer identification and legacy support
+            // need to remap them in the output tree
+            foreach ($data['pools'] as $key => $value) {
+                if (isset($pool_names[$key])) {
+                    $data['pools'][$pool_names[$key]] = $value;
+                    unset($data['pools'][$key]);
+                }
+            }
+        }
         return $data;
     }