webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

dns.cgi: Show error when trying to use ISP nameservers and TLS at the same time.

Browse Source 
Because the ISP-assigned nameservers do not have any TLS-hostname
information they cannot be used, when TLS is activated.

They only can be used if they will be added as "regular" DNS servers
with a TLS-hostname.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2020-01-13 17:40:29 +01:00
parent 6e61f357fb
commit 39a6219fff
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
html/cgi-bin/dns.cgi
View File

@@ -87,11 +87,20 @@ if ($cgiparams{'GENERAL'} eq $Lang::tr{'save'}) {
$cgiparams{'ENABLE_SAFE_SEARCH'} = "off"; $cgiparams{'ENABLE_SAFE_SEARCH'} = "off";
} }
# Store settings into settings file. # Check if using ISP nameservers and TLS is enabled at the same time.
&General::writehash("$settings_file", \%cgiparams); if (($cgiparams{'USE_ISP_NAMESERVERS'} eq "on") && ($cgiparams{'PROTO'} eq "TLS")) {
$errormessage = $Lang::tr{'dns isp nameservers and tls not allowed'}
}
# Call function to handle unbound restart, etc. # Check if there was an error.
&_handle_unbound_and_more() if ( ! $errormessage) {
# Store settings into settings file.
&General::writehash("$settings_file", \%cgiparams);
# Call function to handle unbound restart, etc.
&_handle_unbound_and_more()
}
} }
### ###

1
langs/en/cgi-bin/en.pl
View File

@@ -852,6 +852,7 @@
'dns forward disable dnssec' => 'Disable DNSSEC (dangerous)', 'dns forward disable dnssec' => 'Disable DNSSEC (dangerous)',
'dns forwarding dnssec disabled notice' => '(DNSSEC disabled)', 'dns forwarding dnssec disabled notice' => '(DNSSEC disabled)',
'dns header' => 'Assign DNS server addresses only for DHCP on red0', 'dns header' => 'Assign DNS server addresses only for DHCP on red0',
'dns isp nameservers and tls not allowed' => 'ISP-assigned DNS servers and TLS cannot be used at the same time.',
'dns isp assigned nameserver' => 'ISP-assigned DNS server', 'dns isp assigned nameserver' => 'ISP-assigned DNS server',
'dns list' => 'List of free public DNS servers', 'dns list' => 'List of free public DNS servers',
'dns menu' => 'Assign DNS Server', 'dns menu' => 'Assign DNS Server',