diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-12-22 15:06:41 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-22 15:07:02 -0200 |
| commit | 792dbafd7b83e40e5bb9383294e2abb2b2ad083c (patch) | |
| tree | c9f79584cc779f7d4dcc568f111e54a28d929b80 | |
| parent | 1df8a7b2b1eea0d48765028ebbeeb960da38574a (diff) | |
| download | pfsense-792dbafd7b83e40e5bb9383294e2abb2b2ad083c.zip pfsense-792dbafd7b83e40e5bb9383294e2abb2b2ad083c.tar.gz | |
Add config upgrade code to validate changes made on c2fe67eb and d269747b. It fixes #4134
| -rw-r--r-- | conf.default/config.xml | 2 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 16 |
3 files changed, 18 insertions, 2 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index 9470158..738dd53 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>11.2</version> + <version>11.3</version> <lastchange/> <theme>pfsense_ng</theme> <system> diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index e225c40..1aef692 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.2", + "latest_config" => "11.3", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 5226c2f..e9e77cc 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3503,4 +3503,20 @@ function upgrade_111_to_112() { ); } +function upgrade_112_to_113() { + global $config; + + if (isset($config['notifications']['smtp']['ssl']) && + $config['notifications']['smtp']['ssl'] == "checked") + $config['notifications']['smtp']['ssl'] = true; + else + unset($config['notifications']['smtp']['ssl']); + + if (isset($config['notifications']['smtp']['tls']) && + $config['notifications']['smtp']['tls'] == "checked") + $config['notifications']['smtp']['tls'] = true; + else + unset($config['notifications']['smtp']['tls']); +} + ?> |
