From: pacnal <oliver.chen@nokia-sbell.com>
Date: Mon, 14 Apr 2025 08:51:24 +0000 (+0800)
Subject: Merge branch 'master' into master
X-Git-Tag: dnsdist-2.0.0-alpha2~75^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dab5b8e638e1c0e2833e2ab0d85675024117523c;p=thirdparty%2Fpdns.git

Merge branch 'master' into master
---

dab5b8e638e1c0e2833e2ab0d85675024117523c
diff --cc pdns/dnsdistdist/dnsdist-rust-lib/rust-post-in.rs
index 57a74c880e,ed5feaa228..c2c68bb43e
--- a/pdns/dnsdistdist/dnsdist-rust-lib/rust-post-in.rs
+++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust-post-in.rs
@@@ -95,16 -88,15 +88,16 @@@ fn get_global_configuration_from_serde
      dnsdistsettings::registerKVSObjects(&config.key_value_stores);
      // this needs to be done BEFORE the rules so that they can refer to the selectors
      // by name
-     config.selectors = get_selectors_from_serde(&serde.selectors);
-     config.query_rules = get_query_rules_from_serde(&serde.query_rules);
-     config.cache_miss_rules = get_query_rules_from_serde(&serde.cache_miss_rules);
-     config.response_rules = get_response_rules_from_serde(&serde.response_rules);
-     config.cache_hit_response_rules = get_response_rules_from_serde(&serde.cache_hit_response_rules);
-     config.cache_inserted_response_rules = get_response_rules_from_serde(&serde.cache_inserted_response_rules);
-     config.self_answered_response_rules = get_response_rules_from_serde(&serde.self_answered_response_rules);
-     config.xfr_response_rules = get_response_rules_from_serde(&serde.xfr_response_rules);
-     config.timeout_response_rules = get_response_rules_from_serde(&serde.timeout_response_rules);
-     config
+     config.selectors = get_selectors_from_serde(&serde.selectors)?;
+     config.query_rules = get_query_rules_from_serde(&serde.query_rules)?;
+     config.cache_miss_rules = get_query_rules_from_serde(&serde.cache_miss_rules)?;
+     config.response_rules = get_response_rules_from_serde(&serde.response_rules)?;
+     config.cache_hit_response_rules = get_response_rules_from_serde(&serde.cache_hit_response_rules)?;
+     config.cache_inserted_response_rules = get_response_rules_from_serde(&serde.cache_inserted_response_rules)?;
+     config.self_answered_response_rules = get_response_rules_from_serde(&serde.self_answered_response_rules)?;
+     config.xfr_response_rules = get_response_rules_from_serde(&serde.xfr_response_rules)?;
++    config.timeout_response_rules = get_response_rules_from_serde(&serde.timeout_response_rules)?;
+     Ok(config)
  }
  
  pub fn from_yaml_string(
diff --cc pdns/dnsdistdist/dnsdist-rust-lib/rust/src/lib.rs
index a02d173ca8,bb4caa1cb2..be2411ba96
--- a/pdns/dnsdistdist/dnsdist-rust-lib/rust/src/lib.rs
+++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust/src/lib.rs
@@@ -4500,16 -4503,15 +4509,16 @@@ fn get_global_configuration_from_serde
      dnsdistsettings::registerKVSObjects(&config.key_value_stores);
      // this needs to be done BEFORE the rules so that they can refer to the selectors
      // by name
-     config.selectors = get_selectors_from_serde(&serde.selectors);
-     config.query_rules = get_query_rules_from_serde(&serde.query_rules);
-     config.cache_miss_rules = get_query_rules_from_serde(&serde.cache_miss_rules);
-     config.response_rules = get_response_rules_from_serde(&serde.response_rules);
-     config.cache_hit_response_rules = get_response_rules_from_serde(&serde.cache_hit_response_rules);
-     config.cache_inserted_response_rules = get_response_rules_from_serde(&serde.cache_inserted_response_rules);
-     config.self_answered_response_rules = get_response_rules_from_serde(&serde.self_answered_response_rules);
-     config.xfr_response_rules = get_response_rules_from_serde(&serde.xfr_response_rules);
-     config.timeout_response_rules = get_response_rules_from_serde(&serde.timeout_response_rules);
-     config
+     config.selectors = get_selectors_from_serde(&serde.selectors)?;
+     config.query_rules = get_query_rules_from_serde(&serde.query_rules)?;
+     config.cache_miss_rules = get_query_rules_from_serde(&serde.cache_miss_rules)?;
+     config.response_rules = get_response_rules_from_serde(&serde.response_rules)?;
+     config.cache_hit_response_rules = get_response_rules_from_serde(&serde.cache_hit_response_rules)?;
+     config.cache_inserted_response_rules = get_response_rules_from_serde(&serde.cache_inserted_response_rules)?;
+     config.self_answered_response_rules = get_response_rules_from_serde(&serde.self_answered_response_rules)?;
+     config.xfr_response_rules = get_response_rules_from_serde(&serde.xfr_response_rules)?;
++    config.timeout_response_rules = get_response_rules_from_serde(&serde.timeout_response_rules)?;
+     Ok(config)
  }
  
  pub fn from_yaml_string(