dnsbl.cgi: Add note that ACLs are optional

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 70377df360d7de0efb3e175f4eac830bd3eb512c..109dc0f398c4f911346dc38a37af5d7ba861c88c 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -622,6 +622,7 @@ WARNING: untranslated string: dns title = Domain Name System
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward = DNS Forwarding
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward = DNS Forwarding

diff --git a/doc/language_issues.es b/doc/language_issues.es
index d44baf3a0fe3062e708da16e2fc8ec0572e4f57a..0038f162fd38a1fe29f8474a8597483136576995 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1022,6 +1022,7 @@ WARNING: untranslated string: Captive ACTIVATE = unknown string
 WARNING: untranslated string: Captive clients = unknown string
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: Captive clients = unknown string
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: download report = Download Report

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 142caa588da0b5582b23c425c6118bdf9a38a2ab..a00b1c64666f0843732c8477cd992f9b66556b18 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1003,6 +1003,7 @@ WARNING: untranslated string: ca name must only contain characters and spaces =
 WARNING: untranslated string: configuration file = Configuration File
 WARNING: untranslated string: core notice 3 = available.
 WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: configuration file = Configuration File
 WARNING: untranslated string: core notice 3 = available.
 WARNING: untranslated string: data transfer = Data Transfer

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: done = Done
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: done = Done

diff --git a/doc/language_issues.it b/doc/language_issues.it
index ed649b021777b658a1c958fcd08e0400320ada3a..fd5542e1fdc3442502b95095c2292b15ecdc29ba 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1047,6 +1047,7 @@ WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 03f163ee79559bdb937ddfa97c9f367f5effbb01..94750b660ce94982ad27e6545c07d5a61e909f10 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1046,6 +1046,7 @@ WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6fbda032d03818f456dafea09d3db610161381ac..a0556cf9573413388d61ec9f76a6576e83a678e3 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1002,6 +1002,7 @@ WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward = DNS Forwarding
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward = DNS Forwarding

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 261b917d92a97422c6879e0a4178700d4d31d910..6d233a776036033f0ff98e148e5d16b634f4ae35 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1000,6 +1000,7 @@ WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward = DNS Forwarding
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward = DNS Forwarding

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 856be4dde0e132ba2f62f8336ef7757b850ed635..622d52bb5cd4b47ed0dc7ff302739b16d1c00005 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1028,6 +1028,7 @@ WARNING: untranslated string: dns recursor mode = Recursor Mode
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries
 WARNING: untranslated string: dns tls hostname = TLS Hostname
 WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers
 WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled

diff --git a/doc/language_issues.tw b/doc/language_issues.tw
index c6299c27ecb4a2f6142f5da3ba1bb63583cadc43..cf7d0163eea4b32d5bbe97dd914df03bd092fcb7 100644 (file)
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -1030,6 +1030,7 @@ WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filet
 WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: download report = Download Report

diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index c6299c27ecb4a2f6142f5da3ba1bb63583cadc43..cf7d0163eea4b32d5bbe97dd914df03bd092fcb7 100644 (file)
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -1030,6 +1030,7 @@ WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filet
 WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: ca name must only contain characters and spaces = unknown string
 WARNING: untranslated string: dns servers = DNS Servers

+WARNING: untranslated string: dnsbl acl explanation = By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.

 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: download report = Download Report
 WARNING: untranslated string: dnsbl dns firewall = DNS Firewall
 WARNING: untranslated string: dnsbl error domain specified twice = The domain cannot be allowed and blocked at the same time.
 WARNING: untranslated string: download report = Download Report

diff --git a/doc/language_missings b/doc/language_missings
index 9fafee2d26818da6fcb84e35188b313799c78367..a505fdd5d708ccfeca961c5d50d8fc37412ea96e 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -161,6 +161,7 @@
 < AES-256-GCM
 < CHACHA20-POLY1305
 < dnsbl acl
 < AES-256-GCM
 < CHACHA20-POLY1305
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall


@@ -267,6 +268,7 @@
 < configuration file
 < data transfer
 < dnsbl acl
 < configuration file
 < data transfer
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall


@@ -586,6 +588,7 @@
 < Disabled
 < disconnected
 < dnsbl acl
 < Disabled
 < disconnected
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall


@@ -1286,6 +1289,7 @@
 < Disabled
 < disconnected
 < dnsbl acl
 < Disabled
 < disconnected
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall


@@ -2051,6 +2055,7 @@
 < disconnected
 < dnat address
 < dnsbl acl
 < disconnected
 < dnat address
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall


@@ -3224,6 +3229,7 @@
 < disk access
 < dnat address
 < dnsbl acl
 < disk access
 < dnat address
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall


@@ -4261,6 +4267,7 @@
 < Disabled
 < disconnected
 < dnsbl acl
 < Disabled
 < disconnected
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall


@@ -4708,6 +4715,7 @@
 < Captive wrong type
 < CHACHA20-POLY1305
 < dnsbl acl
 < Captive wrong type
 < CHACHA20-POLY1305
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall


@@ -4822,6 +4830,7 @@
 < Captive wrong type
 < CHACHA20-POLY1305
 < dnsbl acl
 < Captive wrong type
 < CHACHA20-POLY1305
 < dnsbl acl

+< dnsbl acl explanation

 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall
 < dnsbl custom block and allow list
 < dnsbl custom source
 < dnsbl dns firewall

diff --git a/html/cgi-bin/dnsbl.cgi b/html/cgi-bin/dnsbl.cgi
index 16e6dded2efd28314e72f56225a5ec9db9aa1473..9b4e8dcab85706791c821c7a91655babca1c5ed0 100644 (file)
--- a/html/cgi-bin/dnsbl.cgi
+++ b/html/cgi-bin/dnsbl.cgi
@@ -400,6 +400,14 @@ print <<END;
                                </td>
                        </tr>
 
                                </td>
                        </tr>
 

+                       <tr>
+                               <td colspan="2">
+                                       <p>
+                                               $Lang::tr{'dnsbl acl explanation'}
+                                       </p>
+                               </td>
+                       </tr>
+

                        <tr>
                                <td>
                                        $Lang::tr{"network zone"}
                        <tr>
                                <td>
                                        $Lang::tr{"network zone"}

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index fbb2c43cb85cf54fc9cb3b8ce5f7899ba4d5fa23..d7f8148f34f510e5343a550ea44847f82c0f4c11 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -859,6 +859,7 @@
 'dns use isp assigned nameservers' => 'Vom ISP zugewiesene DNS-Server verwenden',
 'dns use protocol for dns queries' => 'Für DNS-Anfragen zu verwendendes Protokoll',
 'dnsbl acl' => 'Zugriffskontrolle',
 'dns use isp assigned nameservers' => 'Vom ISP zugewiesene DNS-Server verwenden',
 'dns use protocol for dns queries' => 'Für DNS-Anfragen zu verwendendes Protokoll',
 'dnsbl acl' => 'Zugriffskontrolle',

+'dnsbl acl explanation' => 'Standardmäßig wird die Blockierung auf das gesamte Netzwerk angewendet. Sie können optional nur bestimmte Netzwerkzonen, Hosts oder Subnetze konfigurieren, für die diese Kategorie gelten soll.',

 'dnsbl custom block and allow list' => 'Individuelle Block- und Freigabeliste',
 'dnsbl custom source' => 'Benutzerdefinierte Quelle',
 'dnsbl dns firewall' => 'DNS-Firewall',
 'dnsbl custom block and allow list' => 'Individuelle Block- und Freigabeliste',
 'dnsbl custom source' => 'Benutzerdefinierte Quelle',
 'dnsbl dns firewall' => 'DNS-Firewall',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2c49106d11a9aa210ce930578e2a5d2f79ae7860..1685a703203a037c3ae86297dd5b230449528f95 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -908,6 +908,7 @@
 'dns use isp assigned nameservers' => 'Use ISP-assigned DNS servers',
 'dns use protocol for dns queries' => 'Protocol for DNS queries',
 'dnsbl acl' => 'Access Control',
 'dns use isp assigned nameservers' => 'Use ISP-assigned DNS servers',
 'dns use protocol for dns queries' => 'Protocol for DNS queries',
 'dnsbl acl' => 'Access Control',

+'dnsbl acl explanation' => 'By default, the blocking will apply to the entire network. You may configure only a few network zones, hosts or subnets where this category will be applied.',

 'dnsbl custom block and allow list' => 'Custom Block And Allow List',
 'dnsbl custom source' => 'Custom source',
 'dnsbl dns firewall' => 'DNS Firewall',
 'dnsbl custom block and allow list' => 'Custom Block And Allow List',
 'dnsbl custom source' => 'Custom source',
 'dnsbl dns firewall' => 'DNS Firewall',