diff options
| author | jim-p <jimp@pfsense.org> | 2011-07-04 11:11:11 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-07-04 11:11:11 -0400 |
| commit | 769c4591ac21fb5dc4aa1b60de825fae02b06b99 (patch) | |
| tree | bb7bcd45d0a395521f99e95d915823ad1424b1ae /etc/inc/openvpn.inc | |
| parent | dbaeaa79da516f5872618436c505abffb5343b74 (diff) | |
| parent | d9489532794da8d73e6d6e9e65431ac4b78789a6 (diff) | |
| download | pfsense-769c4591ac21fb5dc4aa1b60de825fae02b06b99.zip pfsense-769c4591ac21fb5dc4aa1b60de825fae02b06b99.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 28040ee..913903d 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -137,13 +137,13 @@ function openvpn_port_used($prot, $port) { if (is_array($config['openvpn']['openvpn-server'])) foreach ($config['openvpn']['openvpn-server'] as & $settings) if ($port == $settings['local_port'] && - $prot == $settings['protocol']) + $prot == $settings['protocol'] && !isset($settings['disable'])) return $settings['vpnid']; if (is_array($config['openvpn']['openvpn-client'])) foreach ($config['openvpn']['openvpn-client'] as & $settings) if ($port == $settings['local_port'] && - $prot == $settings['protocol']) + $prot == $settings['protocol'] && !isset($settings['disable'])) return $settings['vpnid']; return 0; |
