diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
| commit | 1623ed9700dd89ee871313add2c4947c1227cc39 (patch) | |
| tree | f1809bd8552dd406bcef2cad32b982516c0262fb /etc/inc/openvpn.inc | |
| parent | 4842755397c92f1c16b50b16e01b28768f8b43c1 (diff) | |
| parent | f49c41c538e718d06b44e9c2d279ba9b9580b5ff (diff) | |
| download | pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.zip pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/priv.defs.inc
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 bbecc0c..1cebba7 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; |
