From 43aa7761c4101ae6e12cda644d18a3784ca9cfb5 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 8 Aug 2023 13:15:05 +0200
Subject: [PATCH] Firewall: NAT: Port Forward - do not clone
 'associated-rule-id', closes https://github.com/opnsense/core/issues/6723

---
 src/www/firewall_nat_edit.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index d2fd228d4..015954c9f 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -58,7 +58,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['associated-rule-id'] = "add-associated";
     if (isset($configId)) {
         // copy 1-on-1
-        foreach (array('protocol','target','local-port','descr','interface','associated-rule-id','nosync','log',
+        foreach (array('protocol','target','local-port','descr','interface','nosync','log',
                       'natreflection','created','updated','ipprotocol','tag','tagged','poolopts', 'category') as $fieldname) {
             if (isset($a_nat[$configId][$fieldname])) {
                 $pconfig[$fieldname] = $a_nat[$configId][$fieldname];
@@ -67,6 +67,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             }
         }
         // fields with some kind of logic.
+        if (!isset($_GET['dup']) && isset($a_nat[$configId]['associated-rule-id'])) {
+            $pconfig['associated-rule-id'] = $a_nat[$configId]['associated-rule-id'];
+        }
         $pconfig['disabled'] = isset($a_nat[$configId]['disabled']);
         $pconfig['nordr'] = isset($a_nat[$configId]['nordr']);
         $pconfig['interface'] = explode(",", $pconfig['interface']);