From 7f0b16d074be0a984a3258fd103c24ff9530a78d Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Mon, 29 Aug 2022 16:51:47 +0300
Subject: [PATCH] Pull request: 4403-upd-chlog

Updates #4403.

Squashed commit of the following:

commit b4d6cb80d0c2cbd71ee2f64e0d0c98011b0951c3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 29 16:39:13 2022 +0300

    all: imp chlog

commit f9ab82737a779411813ad5b7bea4e43ec94fbe03
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 29 16:32:19 2022 +0300

    all: upd chlog
---
 CHANGELOG.md            | 11 +++++++++--
 scripts/make/go-lint.sh |  6 ++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 273790b5..555905c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,12 +24,18 @@ and this project adheres to
 
 - New `del` DHCP option which removes the corresponding option from server's
   response ([#4337]).
-    
+
   **NOTE:** This modifier affects all the parameters in the response and not
   only the requested ones.
 - A new HTTP API, `GET /control/blocked_services/services`, that lists all
   available blocked services ([#4535]).
 
+### Changed
+
+- The internal DNS client, used to resolve hostnames of external clients and
+  also during automatic updates, now respects the upstream mode settings for the
+  main DNS client ([#4403]).
+
 ### Deprecated
 
 - Ports 784 and 8853 for DNS-over-QUIC in Docker images.  Users who still serve
@@ -45,6 +51,7 @@ and this project adheres to
 
 [#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993
 [#4337]: https://github.com/AdguardTeam/AdGuardHome/issues/4337
+[#4403]: https://github.com/AdguardTeam/AdGuardHome/issues/4403
 [#4535]: https://github.com/AdguardTeam/AdGuardHome/issues/4535
 [#4745]: https://github.com/AdguardTeam/AdGuardHome/issues/4745
 [#4850]: https://github.com/AdguardTeam/AdGuardHome/issues/4850
@@ -238,7 +245,7 @@ See also the [v0.107.7 GitHub milestone][ms-v0.107.7].
 - Domain-specific private reverse DNS upstream servers are now validated to
   allow only `*.in-addr.arpa` and `*.ip6.arpa` domains pointing to
   locally-served networks ([#3381]).
-    
+
   **NOTE:**  If you already have invalid entries in your configuration, consider
   removing them manually, since they essentially had no effect.
 - Response filtering is now performed using the record types of the answer
diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh
index b67b8eaf..687a65c2 100644
--- a/scripts/make/go-lint.sh
+++ b/scripts/make/go-lint.sh
@@ -220,8 +220,10 @@ exit_on_output gofumpt --extra -e -l .
 "$GO" vet ./...
 
 # Apply more lax standards to the code we haven't properly refactored yet.
-gocyclo --over 17 ./internal/dhcpd/ ./internal/dnsforward/\
-	./internal/filtering/ ./internal/home/ ./internal/querylog/
+gocyclo --over 17 ./internal/dhcpd ./internal/querylog/
+gocyclo --over 16 ./internal/dnsforward/
+gocyclo --over 15 ./internal/home/
+gocyclo --over 13 ./internal/filtering/
 
 # Apply stricter standards to new or somewhat refactored code.
 gocyclo --over 10 ./internal/aghio/ ./internal/aghnet/ ./internal/aghos/\