Fix OpenVPN upgrade code to properly handle the disable option. Fixes item 1a (and probably 1b) in #482 and should be the rest of the fix for #449.

1 files changed, 10 insertions, 0 deletions

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 3675053..cb690d6 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1412,6 +1412,11 @@ function upgrade_051_to_052() {
 			$server['wins_server1'] = $server['dhcp_wins'];
 			unset($server['dhcp_wins']);
 
+			if (!empty($server['disable']))
+				$server['disable'] = true;
+			else
+				unset($server['disable']);
+
 			/* allocate vpnid */
 			$server['vpnid'] = $vpnid++;
 
@@ -1489,6 +1494,11 @@ function upgrade_051_to_052() {
 			/* allocate vpnid */
 			$client['vpnid'] = $vpnid++;
 
+			if (!empty($client['disable']))
+				$client['disable'] = true;
+			else
+				unset($client['disable']);
+
 			$config['openvpn']['openvpn-client'][] = $client;
 		}