diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc index 6fc9896e4..b237aff9a 100644 --- a/src/etc/inc/plugins.inc.d/ipsec.inc +++ b/src/etc/inc/plugins.inc.d/ipsec.inc @@ -947,9 +947,7 @@ function ipsec_write_strongswan_conf() } } - if (!empty($config['ipsec']['auto_routes_disable'])) { - $strongswanTree['charon']['install_routes'] = 'no'; - } + $strongswanTree['charon']['install_routes'] = 'no'; if (isset($a_client['enable']) && isset($a_client['net_list'])) { $strongswanTree['charon']['cisco_unity'] = 'yes'; } diff --git a/src/www/vpn_ipsec_settings.php b/src/www/vpn_ipsec_settings.php index 4f96b19c7..b47590d25 100644 --- a/src/www/vpn_ipsec_settings.php +++ b/src/www/vpn_ipsec_settings.php @@ -39,7 +39,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig = array(); $pconfig['disablevpnrules'] = isset($config['system']['disablevpnrules']); $pconfig['preferoldsa_enable'] = isset($config['ipsec']['preferoldsa']); - $pconfig['auto_routes_disable'] = isset($config['ipsec']['auto_routes_disable']); $pconfig['max_ikev1_exchanges'] = !empty($config['ipsec']['max_ikev1_exchanges']) ? $config['ipsec']['max_ikev1_exchanges'] : null; if (!empty($config['ipsec']['passthrough_networks'])) { $pconfig['passthrough_networks'] = explode(',', $config['ipsec']['passthrough_networks']); @@ -103,11 +102,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } elseif (isset($config['ipsec']['passthrough_networks'])) { unset($config['ipsec']['passthrough_networks']); } - if (!empty($pconfig['auto_routes_disable'])) { - $config['ipsec']['auto_routes_disable'] = true; - } elseif (isset($config['ipsec']['auto_routes_disable'])) { - unset($config['ipsec']['auto_routes_disable']); - } if (!empty($pconfig['max_ikev1_exchanges'])) { $config['ipsec']['max_ikev1_exchanges'] = $pconfig['max_ikev1_exchanges']; @@ -203,18 +197,6 @@ if (isset($input_errors) && count($input_errors) > 0) { -