diff options
| author | Ermal Luçi <eri@pfsense.org> | 2013-09-09 23:49:49 -0700 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2013-09-09 23:49:49 -0700 |
| commit | 6e46621b0209861d8dec9e3b580ca1e3cb32550b (patch) | |
| tree | d7c4baa3338903ddf1d4a817b450e87f95f35de1 | |
| parent | 0281db8cc16c468d90d8892533da9fe9e5fad973 (diff) | |
| parent | 771c14a35c57104764dc3d9d606d642b44f72a72 (diff) | |
| download | pfsense-6e46621b0209861d8dec9e3b580ca1e3cb32550b.zip pfsense-6e46621b0209861d8dec9e3b580ca1e3cb32550b.tar.gz | |
Merge pull request #800 from phil-davis/master
Do not include disabled OpenVPN in vpn_networks and negate_networks
| -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 2e94b09..ba84331 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -777,10 +777,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']; + } } } } |
