Merge: - config: global "blocked_services" settings were reset on startup

* commit 'b1ca7c90d3ef0e72d3535b7cf195adfe83d34e5a': - config: global "blocked_services" settings were reset on startup
- config: global "blocked_services" settings were reset on startup
2019-08-22 15:38:24 +03:00 · 2019-08-22 15:30:48 +03:00 · 2019-08-22 12:05:55 +03:00 · 2019-08-22 12:01:59 +03:00
1 changed files with 2 additions and 2 deletions
--- a/dnsforward/dnsforward.go
+++ b/dnsforward/dnsforward.go
@@ -98,7 +98,7 @@ type FilteringConfig struct {

 	// Names of services to block (globally).
 	// Per-client settings can override this configuration.
-	BlockedServices []string `json:"blocked_services"`
+	BlockedServices []string `yaml:"blocked_services"`

 	dnsfilter.Config `yaml:",inline"`
 }
@@ -522,7 +522,7 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error

 	dnsFilter := s.dnsFilter

-	if !s.conf.ProtectionEnabled {
+	if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
 		return &dnsfilter.Result{}, nil
 	}
Author	SHA1	Message	Date
Andrey Meshkov	64d40bdc47	Merge: - config: global "blocked_services" settings were reset on startup * commit 'b1ca7c90d3ef0e72d3535b7cf195adfe83d34e5a': - config: global "blocked_services" settings were reset on startup	2019-08-22 15:38:24 +03:00
Simon Zolin	b1ca7c90d3	- config: global "blocked_services" settings were reset on startup	2019-08-22 15:30:48 +03:00
Simon Zolin	bde59364c6	Merge: - dnsforward: don't use dnsfilter object after it's closed (additional check) * commit 'a370cd0bf035213ea7d09e1e577a4612934a8c5a': - dnsforward: don't use dnsfilter object after it's closed (additional check)	2019-08-22 12:05:55 +03:00
Simon Zolin	a370cd0bf0	- dnsforward: don't use dnsfilter object after it's closed (additional check)	2019-08-22 12:01:59 +03:00