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

fix: remove TLS name override when no SRV record is present (but properly)

See merge request famedly/conduit!708
This commit is contained in:
Matthias Ahouansou 2024-07-06 16:49:38 +00:00
commit b8a1b4fee5

View file

@ -583,6 +583,13 @@ async fn get_srv_destination(delegated_hostname: String) -> (FedDest, Option<Ins
(add_port_to_hostname(&delegated_hostname), Some(timestamp)) (add_port_to_hostname(&delegated_hostname), Some(timestamp))
} }
} else { } else {
// Removing in case there was previously a SRV record
services()
.globals
.tls_name_override
.write()
.unwrap()
.remove(&delegated_hostname);
debug!("No SRV records found"); debug!("No SRV records found");
(add_port_to_hostname(&delegated_hostname), None) (add_port_to_hostname(&delegated_hostname), None)
} }