Upgrade config to 11.9. Changes IPsec peer ID for EAP types to "any", to retain previous behavior.

Conflicts:
	etc/inc/upgrade_config.inc

1 files changed, 13 insertions, 0 deletions

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index eb32435..5838cac 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3789,6 +3789,19 @@ function upgrade_117_to_118() {
 function upgrade_118_to_119() {
 	global $config;
 
+	// change peerid_type to 'any' for EAP types to retain previous behavior of omitting rightid
+	$a_phase1 =& $config['ipsec']['phase1'];
+
+	foreach ($a_phase1 as &$ph1_entry) {
+		if (strstr($ph1_entry['authentication_method'], 'eap')) {
+			$ph1_entry['peerid_type'] = "any";	
+		}
+	}
+}
+
+function upgrade_119_to_120() {
+	global $config;
+
 	if (!isset($config['installedpackages']['miniupnpd']['config'][0])) {
 		return;
 	}