From 35dd2ea09cc5e133192281cb341e042bec6e0fc7 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 23 Nov 2017 06:51:44 +0100 Subject: [PATCH] openvpn, remove check for mode in remote_network, remote_networkv6 It doesn't seem to make sense to ask for a value and ignore it afterwards, there doesn't appear to be a valid reason to validate here. For https://github.com/opnsense/core/issues/1932 --- src/etc/inc/plugins.inc.d/openvpn.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc index 3c8bf9a35..2d383ffcc 100644 --- a/src/etc/inc/plugins.inc.d/openvpn.inc +++ b/src/etc/inc/plugins.inc.d/openvpn.inc @@ -819,12 +819,11 @@ function openvpn_reconfigure($mode, $settings, $device_only = false) } } - // Add a remote network route if set, and only for p2p modes. - if ((substr($settings['mode'], 0, 3) == "p2p") && (openvpn_validate_cidr($settings['remote_network'], "", true, "ipv4") === false)) { + // Add remote network route if set + if (openvpn_validate_cidr($settings['remote_network'], "", true, "ipv4") === false) { $conf .= openvpn_gen_routes($settings['remote_network'], "ipv4", false); } - // Add a remote network route if set, and only for p2p modes. - if ((substr($settings['mode'], 0, 3) == "p2p") && (openvpn_validate_cidr($settings['remote_networkv6'], "", true, "ipv6") === false)) { + if (openvpn_validate_cidr($settings['remote_networkv6'], "", true, "ipv6") === false) { $conf .= openvpn_gen_routes($settings['remote_networkv6'], "ipv6", false); }