Merge remote-tracking branch 'origin/master' into 6717-fix-conf-symlink

# Conflicts: # CHANGELOG.md
AdguardTeam · Apr 1, 2024 · d17a6de · d17a6de
2 parents 806ff9b + 9305c45
commit d17a6de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,11 +37,13 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
+- Resetting DNS upstream mode when applying unrelated settings ([#6851]).
 - Symbolic links to config YAML are replaced by a copy of the real file by AGH
   after startup ([#6717]).
 
 [#5829]: https://github.com/AdguardTeam/AdGuardHome/issues/5829
 [#6717]: https://github.com/AdguardTeam/AdGuardHome/issues/6717
+[#6851]: https://github.com/AdguardTeam/AdGuardHome/issues/6851
 
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.

diff --git a/internal/dnsforward/http.go b/internal/dnsforward/http.go
@@ -474,8 +474,6 @@ func (s *Server) setConfig(dc *jsonDNSConfig) (shouldRestart bool) {
 
 	if dc.UpstreamMode != nil {
 		s.conf.UpstreamMode = mustParseUpstreamMode(*dc.UpstreamMode)
-	} else {
-		s.conf.UpstreamMode = UpstreamModeLoadBalance
 	}
 
 	if dc.EDNSCSUseCustom != nil && *dc.EDNSCSUseCustom {

diff --git a/internal/dnsforward/http_test.go b/internal/dnsforward/http_test.go
@@ -29,6 +29,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+// TODO(e.burkov):  Use the better approach to testdata with a separate
+// directory for each test, and a separate file for each subtest.  See the
+// [configmigrate] package.
+
 // emptySysResolvers is an empty [SystemResolvers] implementation that always
 // returns nil.
 type emptySysResolvers struct{}