mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
Pull request 1987: 6158-fix-dns-filter
Updates #6158. Squashed commit of the following: commit 763292f9cf5796574b4b79fc32874fb9acefb500 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Aug 31 12:54:08 2023 +0300 dnsforward: fix dns filter
This commit is contained in:
parent
18d15be4e8
commit
27ec6cd59e
@ -542,13 +542,16 @@ func (s *Server) setupLocalResolvers() (err error) {
|
||||
func (s *Server) Prepare(conf *ServerConfig) (err error) {
|
||||
s.conf = *conf
|
||||
|
||||
err = validateBlockingMode(
|
||||
s.dnsFilter.BlockingMode,
|
||||
s.dnsFilter.BlockingIPv4,
|
||||
s.dnsFilter.BlockingIPv6,
|
||||
)
|
||||
if err != nil {
|
||||
return fmt.Errorf("checking blocking mode: %w", err)
|
||||
// dnsFilter can be nil during application update.
|
||||
if s.dnsFilter != nil {
|
||||
err = validateBlockingMode(
|
||||
s.dnsFilter.BlockingMode,
|
||||
s.dnsFilter.BlockingIPv4,
|
||||
s.dnsFilter.BlockingIPv6,
|
||||
)
|
||||
if err != nil {
|
||||
return fmt.Errorf("checking blocking mode: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
s.initDefaultSettings()
|
||||
|
Loading…
Reference in New Issue
Block a user