From f8894444d7a54d02dba1aa518709e0ac3852faea Mon Sep 17 00:00:00 2001
From: loopway <noti16@ali.ch>
Date: Wed, 7 Jan 2026 22:01:47 +0100
Subject: [PATCH 1/2] dns/bind: allow to specify primaryip's port for secondary
 zone

---
 .../src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml     | 2 +-
 .../src/opnsense/service/templates/OPNsense/Bind/named.conf  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml
index 6743b66ae..f1818e577 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml
@@ -18,7 +18,7 @@
                         <forward>forward</forward>
                     </OptionValues>
                 </type>
-                <primaryip type="NetworkField">
+                <primaryip type="IPPortField">
                     <AsList>Y</AsList>
                 </primaryip>
                 <forwardserver type="NetworkField">
diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
index 9196b5de3..05e5eb0fc 100644
--- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
+++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
@@ -156,10 +156,11 @@ zone "{{ domain.domainname }}" {
 {%       if domain.type == 'forward' %}
         forwarders { {{ domain.forwardserver.replace(',', '; ') }}; };
 {%       elif domain.type == 'secondary' %}
+{%         set primaryipport = domain.primaryip | regex_replace('(?<!:)(?<!:[0-9A-Fa-f]{1})(?<!:[0-9A-Fa-f]{2})(?<!:[0-9A-Fa-f]{3})(?<!:[0-9A-Fa-f]{4}):([0-9]+)((,)|$)', ' port \\1\\2') | regex_replace ('\[|\]', '') %}
 {%         if domain.transferkey is defined %}
-        primaries { {{ domain.primaryip.replace(',', ' key "' ~ domain.transferkeyname ~ '"; ') }} key "{{ domain.transferkeyname }}"; };
+        primaries { {{ primaryipport.replace(',', ' key "' ~ domain.transferkeyname ~ '"; ') }} key "{{ domain.transferkeyname }}"; };
 {%         else %}
-        primaries { {{ domain.primaryip.replace(',', '; ') }}; };
+        primaries { {{ primaryipport.replace(',', '; ') }}; };
 {%         endif %}
 {%         if domain.allownotifysecondary is defined %}
         allow-notify { {{ domain.allownotifysecondary.replace(',', '; ') }}; };

From 03e877a0649eebde88694e2ef8d9107d172d4ac0 Mon Sep 17 00:00:00 2001
From: loopway <noti16@ali.ch>
Date: Wed, 7 Jan 2026 22:50:03 +0100
Subject: [PATCH 2/2] dns/bind: allow to specify forwarder's port for forward
 zone

---
 dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml  | 2 +-
 .../src/opnsense/service/templates/OPNsense/Bind/named.conf    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml
index f1818e577..3557ac647 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml
@@ -21,7 +21,7 @@
                 <primaryip type="IPPortField">
                     <AsList>Y</AsList>
                 </primaryip>
-                <forwardserver type="NetworkField">
+                <forwardserver type="IPPortField">
                     <AsList>Y</AsList>
                 </forwardserver>
                 <transferkeyalgo type="OptionField">
diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
index 05e5eb0fc..007559b52 100644
--- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
+++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
@@ -154,7 +154,8 @@ zone "rpzbing" { type primary; file "/usr/local/etc/namedb/primary/bing.db"; not
 zone "{{ domain.domainname }}" {
         type {{ domain.type }};
 {%       if domain.type == 'forward' %}
-        forwarders { {{ domain.forwardserver.replace(',', '; ') }}; };
+{%         set forwardserverport = domain.forwardserver | regex_replace('(?<!:)(?<!:[0-9A-Fa-f]{1})(?<!:[0-9A-Fa-f]{2})(?<!:[0-9A-Fa-f]{3})(?<!:[0-9A-Fa-f]{4}):([0-9]+)((,)|$)', ' port \\1\\2') | regex_replace ('\[|\]', '') %}
+        forwarders { {{ forwardserverport.replace(',', '; ') }}; };
 {%       elif domain.type == 'secondary' %}
 {%         set primaryipport = domain.primaryip | regex_replace('(?<!:)(?<!:[0-9A-Fa-f]{1})(?<!:[0-9A-Fa-f]{2})(?<!:[0-9A-Fa-f]{3})(?<!:[0-9A-Fa-f]{4}):([0-9]+)((,)|$)', ' port \\1\\2') | regex_replace ('\[|\]', '') %}
 {%         if domain.transferkey is defined %}