From ad09e7aa6c1d97f00c13fea2421719176deddf78 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 28 Mar 2025 17:35:20 +0100 Subject: [PATCH] Services: Unbound DNS: Blocklist - drop "exclude" phrase from log entry as it doesn't make much sense anymore (as a result of https://github.com/opnsense/core/commit/aa2cff3e665fd0fb2b22b69be4334d365ee066eb) --- src/opnsense/scripts/unbound/blocklists/default_bl.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/opnsense/scripts/unbound/blocklists/default_bl.py b/src/opnsense/scripts/unbound/blocklists/default_bl.py index a8a6608b2..7ed913831 100755 --- a/src/opnsense/scripts/unbound/blocklists/default_bl.py +++ b/src/opnsense/scripts/unbound/blocklists/default_bl.py @@ -50,7 +50,7 @@ class DefaultBlocklistHandler(BaseBlocklistHandler): def get_blocklist(self): result = {} for blocklist, bl_shortcode in self._blocklists_in_config(): - per_file_stats = {'uri': blocklist, 'skip': 0, 'blocklist': 0, 'wildcard': 0} + per_file_stats = {'uri': blocklist, 'blocklist': 0, 'wildcard': 0} for domain in self._domains_in_blocklist(blocklist): if self.domain_pattern.match(domain): per_file_stats['blocklist'] += 1 @@ -66,11 +66,9 @@ class DefaultBlocklistHandler(BaseBlocklistHandler): per_file_stats['wildcard'] += 1 else: result[domain] = {'bl': bl_shortcode, 'wildcard': False} - else: - per_file_stats['skip'] += 1 syslog.syslog( syslog.LOG_NOTICE, - 'blocklist: %(uri)s (exclude: %(skip)d block: %(blocklist)d wildcard: %(wildcard)d)' % per_file_stats + 'blocklist: %(uri)s (block: %(blocklist)d wildcard: %(wildcard)d)' % per_file_stats ) if self.cnf and self.cnf.has_section('include'):