diff options
| author | jim-p <jimp@netgate.com> | 2018-12-18 09:11:18 -0500 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2018-12-18 09:11:41 -0500 |
| commit | b0220979291ec78f6312720fcb1b754df30aa01a (patch) | |
| tree | 8ad0162f3dd66f6098f30ea386cd6a52bba91178 /src | |
| parent | 3e552cec671e26b8108db4ff8e2f48009947dc1d (diff) | |
| download | pfsense-b0220979291ec78f6312720fcb1b754df30aa01a.zip pfsense-b0220979291ec78f6312720fcb1b754df30aa01a.tar.gz | |
Ensure IPsec P1 entries have a 'protocol' value. Fixes #9207
(cherry picked from commit d188b7251a83b4a8a39ba50dfaf9a1cba35cad17)
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 638d729..6d082a0 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -69,7 +69,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "18.9", + "latest_config" => "19.0", "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", "wan_interface_name" => "wan", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 3c0140d..97fb3d6 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -5921,6 +5921,19 @@ function upgrade_188_to_189() { } } +/* Older pre-existing IPsec P1 entries may not have had the protocol explicitly + * defined. Fill in the default value of 'inet'. + * https://redmine.pfsense.org/issues/9207 */ +function upgrade_189_to_190() { + global $config; + init_config_arr(array('ipsec', 'phase1')); + foreach ($config['ipsec']['phase1'] as & $ph1ent) { + if (empty($ph1ent['protocol'])) { + $ph1ent['protocol'] = 'inet'; + } + } +} + /* * Special function that is called independent of current config version. It's * a workaround to have config_upgrade running on older versions after next |
