Skip to content

Commit

Permalink
Pull request: home: fix client blocked svcs
Browse files Browse the repository at this point in the history
Merge in DNS/adguard-home from fix-blocked-svcs to master

Squashed commit of the following:

commit 7e4ccbe
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Sep 30 16:48:27 2022 +0300

    all: imp log of changes

commit 171836f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Sep 30 16:22:07 2022 +0300

    all: log changes

commit f5cde0a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Sep 30 16:04:14 2022 +0300

    home: fix client blocked svcs
  • Loading branch information
EugeneOne1 committed Sep 30, 2022
1 parent 4d404b8 commit 2ffea60
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ and this project adheres to

### Fixed

- User-specific blocked services not applying correctly.
- `only application/json is allowed` errors in various APIs ([#4970]).

[#4970]: https://github.com/AdguardTeam/AdGuardHome/issues/4970
Expand All @@ -39,7 +40,6 @@ See also the [v0.107.15 GitHub milestone][ms-v0.107.15].
-->



## [v0.107.14] - 2022-09-29

See also the [v0.107.14 GitHub milestone][ms-v0.107.14].
Expand Down
4 changes: 4 additions & 0 deletions internal/home/clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,10 @@ func (clients *clientsContainer) addFromConfig(objects []*clientObject) {
}
}

if cli.BlockedServices == nil && cli.UseOwnBlockedServices {
cli.BlockedServices = []string{}
}

for _, t := range o.Tags {
if clients.allTags.Has(t) {
cli.Tags = append(cli.Tags, t)
Expand Down

0 comments on commit 2ffea60

Please sign in to comment.