mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request: 2956 fix clients disabling 

Merge in DNS/adguard-home from 2956-fix-flag to master

Closes #2956.
Updates #1947.

Squashed commit of the following:

commit ffb98f752f6d4c40ea166ff1e482edcd7f028513
Merge: 800d67db 7be2fc37
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 14 19:01:34 2021 +0300

    Merge branch 'master' into 2956-fix-flag

commit 800d67db84786c8fe93d38b6aa932aa4dd4dd345
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 14 18:54:26 2021 +0300

    home: fix clients disabling
This commit is contained in:
Eugene Burkov 2021-04-14 19:18:48 +03:00
parent 7be2fc37e6
commit 69f526b13d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/home/clients.go
View File

@ -117,9 +117,7 @@ func (clients *clientsContainer) Init(
}
clients.dhcpServer = dhcpServer
if etcHosts != nil {
clients.etcHosts = etcHosts
}
clients.addFromConfig(objects)
if !clients.testing {

2
internal/home/home.go
View File

@ -201,8 +201,8 @@ func setupConfig(args options) {
if !args.noEtcHosts {
Context.etcHosts = &aghnet.EtcHostsContainer{}
Context.etcHosts.Init("")
Context.clients.Init(config.Clients, Context.dhcpServer, Context.etcHosts)
}
Context.clients.Init(config.Clients, Context.dhcpServer, Context.etcHosts)
config.Clients = nil
if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&