Merge branch 'master' into ADG-9415

2025-02-11 14:44:06 +03:00
parent fd12e33c06 2fe2d254b5
commit ee1520307f
13 changed files with 177 additions and 3 deletions
--- a/internal/home/config.go
+++ b/internal/home/config.go
@@ -692,6 +692,7 @@ func (c *configuration) write() (err error) {
 		config.Clients.Sources.RDNS = addrProcConf.UseRDNS
 		config.Clients.Sources.WHOIS = addrProcConf.UseWHOIS
 		dns.UsePrivateRDNS = addrProcConf.UsePrivateRDNS
+		dns.UpstreamTimeout = timeutil.Duration(s.UpstreamTimeout())
 	}

 	if Context.dhcpServer != nil {