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:06:41 -0200 |
| commit | ccf30846e7b7651da65ab0b5f44e77c70ba8c0d9 (patch) | |
| tree | e6dc71ac6c8d1946309ad01c57032644c512e195 /etc | |
| parent | cfec85587cc71bfcc772da59e2319db8998aa9a3 (diff) | |
| download | pfsense-ccf30846e7b7651da65ab0b5f44e77c70ba8c0d9.zip pfsense-ccf30846e7b7651da65ab0b5f44e77c70ba8c0d9.tar.gz | |
Add config upgrade code to validate changes made on c2fe67eb and d269747b. It fixes #4134
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index be72578..1d7e04d 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']); +} + ?> |
