From 172c2e482588ba9e7db87866c0c97b50bb584363 Mon Sep 17 00:00:00 2001 From: James Hodgkinson Date: Wed, 8 Dec 2021 10:02:04 +1000 Subject: [PATCH] Check before rename for #622 (#624) --- kanidmd/src/lib/core/mod.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/kanidmd/src/lib/core/mod.rs b/kanidmd/src/lib/core/mod.rs index 9d97cc2c3..23f4484b2 100644 --- a/kanidmd/src/lib/core/mod.rs +++ b/kanidmd/src/lib/core/mod.rs @@ -382,6 +382,20 @@ pub fn domain_rename_core(config: &Configuration, new_domain_name: &str) { } }; + // make sure we're actually changing the domain name... + match task::block_on(qs.read_async()).get_domain_name() { + Ok(old_domain_name) => { + if &old_domain_name == &new_domain_name { + admin_info!("Domain name not changing, stopping."); + return; + } + } + Err(e) => { + admin_error!("Failed to query domain name, quitting! -> {:?}", e); + return; + } + } + let qs_write = task::block_on(qs.write_async(duration_from_epoch_now())); let r = qs_write .domain_rename(new_domain_name)