Merge branch 'master' into 1920-client-find

This commit is contained in:
ArtemBaskal
2020-09-23 20:29:48 +03:00
75 changed files with 3011 additions and 776 deletions

View File

@@ -407,11 +407,9 @@ func (clients *clientsContainer) check(c *Client) error {
}
sort.Strings(c.Tags)
if len(c.Upstreams) != 0 {
err := dnsforward.ValidateUpstreams(c.Upstreams)
if err != nil {
return fmt.Errorf("invalid upstream servers: %s", err)
}
err := dnsforward.ValidateUpstreams(c.Upstreams)
if err != nil {
return fmt.Errorf("invalid upstream servers: %s", err)
}
return nil