diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-01-29 00:04:39 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-01-29 00:04:39 -0600 |
| commit | 1c1ca39bd5276bdd3519ee1e800093f6173833aa (patch) | |
| tree | e234af893c63b03c7667ceb46e73a9fce87f85bc | |
| parent | 4742e635f810fb6e6aac6746c747addbaf350b73 (diff) | |
| download | pfsense-1c1ca39bd5276bdd3519ee1e800093f6173833aa.zip pfsense-1c1ca39bd5276bdd3519ee1e800093f6173833aa.tar.gz | |
retain OpenVPN's net30 default topology for upgraded configs so they still work. Ticket #5764
| -rw-r--r-- | src/conf.default/config.xml | 2 | ||||
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 21 |
3 files changed, 23 insertions, 2 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 85c2e58..0e067e7 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>14.0</version> + <version>14.1</version> <lastchange/> <system> <optimization>normal</optimization> diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index c0b2203..550245f 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "14.0", + "latest_config" => "14.1", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 11baf48..7174ca6 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4351,4 +4351,25 @@ function upgrade_139_to_140() { } } +function upgrade_140_to_141() { + global $config; + + // retain OpenVPN's net30 default topology for upgraded configs so they still work + if (is_array($config['openvpn']['openvpn-server'])) { + foreach ($config['openvpn']['openvpn-server'] as $idx => $ovpnserver) { + if (!isset($ovpnserver['topology'])) { + $config['openvpn']['openvpn-server'][$idx]['topology'] = "net30"; + } + } + } + + if (is_array($config['openvpn']['openvpn-client'])) { + foreach ($config['openvpn']['openvpn-client'] as $idx => $ovpnclient) { + if (!isset($ovpnclient['topology'])) { + $config['openvpn']['openvpn-client'][$idx]['topology'] = "net30"; + } + } + } +} + ?> |
