From 8a199b64f59d7202131b7d820c6729fe0f17eee1 Mon Sep 17 00:00:00 2001
From: Jean-Gabriel Gill-Couture <jg@nationtech.io>
Date: Tue, 6 May 2025 11:45:19 -0400
Subject: [PATCH] feat: Upgrade opnsense-config crates to be compatible with
 opnsense 25.1_5

---
 opnsense-config-xml/src/data/caddy.rs    |  6 +++++-
 opnsense-config-xml/src/data/opnsense.rs | 10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/opnsense-config-xml/src/data/caddy.rs b/opnsense-config-xml/src/data/caddy.rs
index f1c69f2..b4ca0fc 100644
--- a/opnsense-config-xml/src/data/caddy.rs
+++ b/opnsense-config-xml/src/data/caddy.rs
@@ -40,7 +40,11 @@ pub struct CaddyGeneral {
     #[yaserde(rename = "TlsDnsOptionalField4")]
     pub tls_dns_optional_field4: MaybeString,
     #[yaserde(rename = "TlsDnsPropagationTimeout")]
-    pub tls_dns_propagation_timeout: MaybeString,
+    pub tls_dns_propagation_timeout: Option<MaybeString>,
+    #[yaserde(rename = "TlsDnsPropagationTimeoutPeriod")]
+    pub tls_dns_propagation_timeout_period: Option<MaybeString>,
+    #[yaserde(rename = "TlsDnsPropagationDelay")]
+    pub tls_dns_propagation_delay: Option<MaybeString>,
     #[yaserde(rename = "TlsDnsPropagationResolvers")]
     pub tls_dns_propagation_resolvers: MaybeString,
     pub accesslist: MaybeString,
diff --git a/opnsense-config-xml/src/data/opnsense.rs b/opnsense-config-xml/src/data/opnsense.rs
index aa39621..aec4a51 100644
--- a/opnsense-config-xml/src/data/opnsense.rs
+++ b/opnsense-config-xml/src/data/opnsense.rs
@@ -45,6 +45,7 @@ pub struct OPNsense {
     #[yaserde(rename = "Pischem")]
     pub pischem: Option<Pischem>,
     pub ifgroups: Ifgroups,
+    pub dnsmasq: Option<RawXml>,
 }
 
 impl From<String> for OPNsense {
@@ -166,7 +167,7 @@ pub struct Sysctl {
 pub struct SysctlItem {
     pub descr: MaybeString,
     pub tunable: String,
-    pub value: String,
+    pub value: MaybeString,
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -279,6 +280,7 @@ pub struct User {
     pub scope: String,
     pub groupname: Option<MaybeString>,
     pub password: String,
+    pub pwd_changed_at: Option<MaybeString>,
     pub uid: u32,
     pub disabled: Option<u8>,
     pub landing_page: Option<MaybeString>,
@@ -540,6 +542,8 @@ pub struct GeneralIpsec {
     preferred_oldsa: Option<MaybeString>,
     disablevpnrules: Option<MaybeString>,
     passthrough_networks: Option<MaybeString>,
+    user_source: Option<MaybeString>,
+    local_group: Option<MaybeString>,
 }
 
 #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
@@ -1219,6 +1223,7 @@ pub struct Host {
     pub rr: String,
     pub mxprio: MaybeString,
     pub mx: MaybeString,
+    pub ttl: MaybeString,
     pub server: String,
     pub description: Option<String>,
 }
@@ -1233,6 +1238,7 @@ impl Host {
             rr,
             server,
             mxprio: MaybeString::default(),
+            ttl: MaybeString::default(),
             mx: MaybeString::default(),
             description: None,
         }
@@ -1421,7 +1427,7 @@ pub struct VirtualIp {
     #[yaserde(attribute = true)]
     pub version: String,
     #[yaserde(rename = "vip")]
-    pub vip: Vip,
+    pub vip: Option<Vip>,
 }
 
 #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]