summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf.default/config.xml2
-rw-r--r--etc/inc/globals.inc2
-rw-r--r--etc/inc/unbound.inc2
-rw-r--r--etc/inc/upgrade_config.inc7
-rw-r--r--usr/local/www/services_unbound.php4
5 files changed, 12 insertions, 5 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml
index f9d4bbc..5c0b484 100644
--- a/conf.default/config.xml
+++ b/conf.default/config.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<pfsense>
- <version>11.4</version>
+ <version>11.5</version>
<lastchange/>
<theme>pfsense_ng</theme>
<system>
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index ae7352f..67c33ce 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -73,7 +73,7 @@ $g = array(
"disablecrashreporter" => false,
"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
"debug" => false,
- "latest_config" => "11.4",
+ "latest_config" => "11.5",
"nopkg_platforms" => array("cdrom"),
"minimum_ram_warning" => "101",
"minimum_ram_warning_text" => "128 MB",
diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc
index 1bd2f7e..496ca66 100644
--- a/etc/inc/unbound.inc
+++ b/etc/inc/unbound.inc
@@ -205,7 +205,7 @@ EOF;
// Add custom Unbound options
if ($config['unbound']['custom_options']) {
- $custom_options_source = explode("\n", $config['unbound']['custom_options']);
+ $custom_options_source = explode("\n", base64_decode($config['unbound']['custom_options']));
$custom_options = "# Unbound custom options\n";
foreach ($custom_options_source as $ent)
$custom_options .= $ent."\n";
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 324e51e..72fc80f 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3532,4 +3532,11 @@ function upgrade_113_to_114() {
$ph1ent['iketype'] = 'ikev1';
}
+function upgrade_114_to_115() {
+ global $config;
+
+ if (isset($config['unbound']['custom_options']))
+ $config['unbound']['custom_options'] = base64_encode($config['unbound']['custom_options']);
+}
+
?>
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php
index 52d976d..2b943dd 100644
--- a/usr/local/www/services_unbound.php
+++ b/usr/local/www/services_unbound.php
@@ -81,7 +81,7 @@ if (isset($config['unbound']['txtsupport'])) {
}
$pconfig['port'] = $config['unbound']['port'];
-$pconfig['custom_options'] = $config['unbound']['custom_options'];
+$pconfig['custom_options'] = base64_decode($config['unbound']['custom_options']);
if (empty($config['unbound']['active_interface'])) {
$pconfig['active_interface'] = array();
@@ -171,7 +171,7 @@ if ($_POST) {
$a_unboundcfg['outgoing_interface'] = implode(",", $_POST['outgoing_interface']);
}
- $a_unboundcfg['custom_options'] = str_replace("\r\n", "\n", $_POST['custom_options']);
+ $a_unboundcfg['custom_options'] = base64_encode(str_replace("\r\n", "\n", $_POST['custom_options']));
if (!$input_errors) {
write_config("DNS Resolver configured.");
OpenPOWER on IntegriCloud