summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-01-29 17:59:20 -0600
committerChris Buechler <cmb@pfsense.org>2016-01-29 17:59:20 -0600
commit68e82ecb26548ca51d9e9fd112c1ec422d0849f0 (patch)
tree2e670791bf895ec79dd5b667856714a34c17ee96 /src
parentf5ebc545f1d1c8ea0d645433f33badb737999e30 (diff)
downloadpfsense-68e82ecb26548ca51d9e9fd112c1ec422d0849f0.zip
pfsense-68e82ecb26548ca51d9e9fd112c1ec422d0849f0.tar.gz
OpenVPN server config upgrade already handled in 129_to_130. Ticket #5764
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/upgrade_config.inc10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 9e356e3..d64a3c9 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4354,15 +4354,7 @@ 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']) && 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";
- }
- }
- }
-
+ // retain OpenVPN's net30 default topology for upgraded client configs so they still work
if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-client'])) {
foreach ($config['openvpn']['openvpn-client'] as $idx => $ovpnclient) {
if (!isset($ovpnclient['topology'])) {
OpenPOWER on IntegriCloud