mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix config version # arrising from merging older PR

Browse Source
This commit is contained in:
Steve Beaver 2018-02-02 15:41:59 -05:00
parent d205ac7af4
commit 76ca1bc50e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/globals.inc
View File

@ -74,7 +74,7 @@ $g = array(
"disablecrashreporter" => false,
"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
"debug" => false,
"latest_config" => "17.4",
"latest_config" => "17.5",
"minimum_ram_warning" => "101",
"minimum_ram_warning_text" => "128 MB",
"wan_interface_name" => "wan",

4
src/etc/inc/upgrade_config.inc
View File

@ -5493,7 +5493,7 @@ function additional_config_upgrade() {
/* IPsec Phase1 now supports multiple authentication ciphers to be specified from the webgui.
* This is usefull for mobile users using different OS's supporting different ciphers.
*/
function upgrade_173_to_174() {
function upgrade_174_to_175() {
global $config;
if (is_array($config['ipsec']['phase1'])) {
$a_phase1 = &$config['ipsec']['phase1'];
@ -5502,7 +5502,7 @@ function upgrade_173_to_174() {
$item['encryption-algorithm'] = $phase1['encryption-algorithm'];
$item['hash-algorithm'] = $phase1['hash-algorithm'];
$item['dhgroup'] = $phase1['dhgroup'];
$phase1['encryption']['item'][] = $item;
$phase1['encryption']['item'][] = $item;
unset($phase1['encryption-algorithm']);
unset($phase1['hash-algorithm']);
unset($phase1['dhgroup']);