diff options
| author | jim-p <jimp@pfsense.org> | 2016-04-13 13:59:56 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2016-04-13 13:59:56 -0400 |
| commit | eb2202c7e40e192fa151f023747777a102783886 (patch) | |
| tree | b63679945fa1b6f260f1a4fe83a8e8b00a23fb32 /src/etc/inc/upgrade_config.inc | |
| parent | cc0b9f915ec4cea6feae8bcbbaa97c5e50cde7af (diff) | |
| download | pfsense-eb2202c7e40e192fa151f023747777a102783886.zip pfsense-eb2202c7e40e192fa151f023747777a102783886.tar.gz | |
Correct OpenVPN upgrade code for topology subnet.
Diffstat (limited to 'src/etc/inc/upgrade_config.inc')
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 2d0ab84..b2ad1bd 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4134,7 +4134,7 @@ function upgrade_129_to_130() { /* Change OpenVPN topology_subnet checkbox into topology multi-select #5526 */ if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server'])) { foreach ($config['openvpn']['openvpn-server'] as & $serversettings) { - if (isset($serversettings['topology_subnet'])) { + if (strtolower($serversettings['topology_subnet']) == "yes") { unset($serversettings['topology_subnet']); $serversettings['topology'] = "subnet"; } else { @@ -4356,6 +4356,7 @@ function upgrade_140_to_141() { global $config; // retain OpenVPN's net30 default topology for upgraded client configs so they still work + // This is for 2.3 ALPHA to a later 2.3, not 2.2.x upgrades, which had no topology setting on clients if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-client'])) { foreach ($config['openvpn']['openvpn-client'] as $idx => $ovpnclient) { if (!isset($ovpnclient['topology'])) { |
