diff options
author | Phil Davis <phil.davis@world.inf.org> | 2013-09-09 19:30:37 -0700 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2013-09-10 09:22:03 +0000 |
commit | e4cf52ed14b7dc58a711d885ed2e428ed67d1135 (patch) | |
tree | a94e8f8008e45225d0c65a764a7c632619e0c44d /etc | |
parent | 24670866827b4e2d7a4a05baaf6d09ee377ce7cb (diff) | |
download | pfsense-e4cf52ed14b7dc58a711d885ed2e428ed67d1135.zip pfsense-e4cf52ed14b7dc58a711d885ed2e428ed67d1135.tar.gz |
Do not include disabled OpenVPN in vpn_networks and negate_networks
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/filter.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 260c1c2..393ffb5 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -770,10 +770,12 @@ function filter_get_vpns_list() { if(is_array($config['openvpn']["openvpn-$type"])) { foreach ($config['openvpn']["openvpn-$type"] as $settings) { if(is_array($settings)) { - if (is_subnet($settings['remote_network']) && $settings['remote_network'] <> "0.0.0.0/0") - $vpns_arr[] = $settings['remote_network']; - if (is_subnet($settings['tunnel_network']) && $settings['tunnel_network'] <> "0.0.0.0/0") - $vpns_arr[] = $settings['tunnel_network']; + if (!isset($settings['disable'])) { + if (is_subnet($settings['remote_network']) && $settings['remote_network'] <> "0.0.0.0/0") + $vpns_arr[] = $settings['remote_network']; + if (is_subnet($settings['tunnel_network']) && $settings['tunnel_network'] <> "0.0.0.0/0") + $vpns_arr[] = $settings['tunnel_network']; + } } } } |