diff options
| author | jim-p <jimp@pfsense.org> | 2017-07-13 13:58:29 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-07-13 13:58:38 -0400 |
| commit | 324bbc3fb06aadbfbe9ce309a03759a35ab82294 (patch) | |
| tree | 643758db089f849b7f96995c2de57f1b857ad26b /src/usr/local | |
| parent | 02068d31c52d9d4c3b6f8a23442d03897eff962d (diff) | |
| download | pfsense-324bbc3fb06aadbfbe9ce309a03759a35ab82294.zip pfsense-324bbc3fb06aadbfbe9ce309a03759a35ab82294.tar.gz | |
Restructure how unbound zone data is written to fix processing of "redirect" zone entries. Fixes #7690
Also corrects some other misc issues for formatting of zone data.
While here, add an option, not exposed in the GUI, for users to get the previous behavior of defining short names for hosts.
(cherry picked from commit 021332fa29f0c08bff833ce1c7ddcb9ac9a769b1)
Diffstat (limited to 'src/usr/local')
| -rw-r--r-- | src/usr/local/www/services_unbound.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index c4b7d8b..23a16db 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -188,6 +188,10 @@ if ($_POST) { $input_errors[] = gettext("DHCP Server must be enabled for DHCP Registration to work in DNS Resolver."); } + if (($pconfig['system_domain_local_zone_type'] == "redirect") && isset($pconfig['regdhcp'])) { + $input_errors[] = gettext('A System Domain Local Zone Type of "redirect" is not compatible with DHCP Registration.'); + } + $display_custom_options = $pconfig['custom_options']; $pconfig['custom_options'] = base64_encode(str_replace("\r\n", "\n", $pconfig['custom_options'])); |
