From c6f859f97332edd5bcff64110ceaafeefcab86ad Mon Sep 17 00:00:00 2001
From: Willem <wrolleman@nationtech.io>
Date: Tue, 16 Dec 2025 15:30:49 -0500
Subject: [PATCH] fix(OPNSense): update fields for haproxyy and opnsense
 following most recent update and upgrade to opnsense

---
 opnsense-config-xml/src/data/haproxy.rs  |  2 +-
 opnsense-config-xml/src/data/opnsense.rs | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/opnsense-config-xml/src/data/haproxy.rs b/opnsense-config-xml/src/data/haproxy.rs
index e82cb33..1114038 100644
--- a/opnsense-config-xml/src/data/haproxy.rs
+++ b/opnsense-config-xml/src/data/haproxy.rs
@@ -114,7 +114,7 @@ pub struct HAProxy {
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 pub struct HAProxyResolvers {
     #[yaserde(rename = "resolver")]
-    pub resolver: Resolver,
+    pub resolver: Option<Resolver>,
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
diff --git a/opnsense-config-xml/src/data/opnsense.rs b/opnsense-config-xml/src/data/opnsense.rs
index debbfbf..ad743cd 100644
--- a/opnsense-config-xml/src/data/opnsense.rs
+++ b/opnsense-config-xml/src/data/opnsense.rs
@@ -136,6 +136,7 @@ pub struct Rule {
     pub updated: Option<Updated>,
     pub created: Option<Created>,
     pub disabled: Option<MaybeString>,
+    pub log: Option<u32>,
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -1140,6 +1141,7 @@ pub struct UnboundGeneral {
     pub local_zone_type: String,
     pub outgoing_interface: MaybeString,
     pub enable_wpad: MaybeString,
+    pub safesearch: MaybeString,
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -1193,15 +1195,15 @@ pub struct Acls {
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
 pub struct Dnsbl {
-    pub enabled: i32,
-    pub safesearch: MaybeString,
+    pub enabled: Option<i32>,
+    pub safesearch: Option<MaybeString>,
     #[yaserde(rename = "type")]
-    pub r#type: MaybeString,
-    pub lists: MaybeString,
-    pub whitelists: MaybeString,
-    pub blocklists: MaybeString,
-    pub wildcards: MaybeString,
-    pub address: MaybeString,
+    pub r#type: Option<MaybeString>,
+    pub lists: Option<MaybeString>,
+    pub whitelists: Option<MaybeString>,
+    pub blocklists: Option<MaybeString>,
+    pub wildcards: Option<MaybeString>,
+    pub address: Option<MaybeString>,
     pub nxdomain: Option<i32>,
 }
 
@@ -1229,6 +1231,7 @@ pub struct Host {
     pub ttl: Option<MaybeString>,
     pub server: String,
     pub description: Option<String>,
+    pub txtdata: MaybeString,
 }
 
 impl Host {
@@ -1244,6 +1247,7 @@ impl Host {
             ttl: Some(MaybeString::default()),
             mx: MaybeString::default(),
             description: None,
+            txtdata: MaybeString::default(),
         }
     }
 }