Merge branch 'remove-tls-override-when-no-srv-response' into 'next'

fix: remove TLS name override when no SRV record is present

See merge request famedly/conduit!707
This commit is contained in:
Matthias Ahouansou 2024-07-06 16:24:32 +00:00
commit 75322af8c7

View file

@ -564,6 +564,13 @@ async fn get_srv_destination(delegated_hostname: String) -> (FedDest, Option<Ins
(override_ip.iter().collect(), force_port.unwrap_or(8448)), (override_ip.iter().collect(), force_port.unwrap_or(8448)),
); );
} else { } else {
// Removing in case there was previously a SRV record
services()
.globals
.tls_name_override
.write()
.unwrap()
.remove(&delegated_hostname);
warn!("Using SRV record, but could not resolve to IP"); warn!("Using SRV record, but could not resolve to IP");
} }