stalwartlabs/mail-server
1
1
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2025-09-12 15:04:22 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: Macro references are replaced with their content when writing config file (closes #1595)

Browse source
This commit is contained in:
mdecimus 2025-05-29 19:24:29 +02:00
parent aed60c3441
commit 207d370fd9
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/common/src/manager/boot.rs
View file

@ -153,6 +153,7 @@ impl BootManager {
config.new_build_error("*", format!("Could not read configuration file: {err}")); config.new_build_error("*", format!("Could not read configuration file: {err}"));
} }
} }
let cfg_local = config.keys.clone();
// Resolve environment macros // Resolve environment macros
config.resolve_macros(&["env"]).await; config.resolve_macros(&["env"]).await;
@ -171,13 +172,11 @@ impl BootManager {
let local_patterns = Patterns::parse(&mut config); let local_patterns = Patterns::parse(&mut config);
// Build local keys and warn about database keys defined in the local configuration // Build local keys and warn about database keys defined in the local configuration
let mut cfg_local = BTreeMap::new();
let mut warn_keys = Vec::new(); let mut warn_keys = Vec::new();
for (key, value) in &config.keys { for key in config.keys.keys() {
if !local_patterns.is_local_key(key) { if !local_patterns.is_local_key(key) {
warn_keys.push(key.clone()); warn_keys.push(key.clone());
} }
cfg_local.insert(key.clone(), value.clone());
} }
for warn_key in warn_keys { for warn_key in warn_keys {
config.new_build_warning( config.new_build_warning(