diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-01-19 12:22:32 +0545 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-19 10:26:18 -0200 |
| commit | 9f8751b5c2426a4932cb813dae33198961ccff4b (patch) | |
| tree | e6d684bce3ae5f5ba2f32ac6d00101a4e874e328 /src/etc | |
| parent | af4ae33e22e5577c693cac20575094488483092e (diff) | |
| download | pfsense-9f8751b5c2426a4932cb813dae33198961ccff4b.zip pfsense-9f8751b5c2426a4932cb813dae33198961ccff4b.tar.gz | |
Fix #7136 Start OpenVPN on ordinary VIP
(cherry picked from commit ddf99718d5f1f4545483c39d3759fdfbb788b0fb)
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/openvpn.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index 39e7e9d..2e80d70 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -1131,7 +1131,7 @@ function openvpn_restart($mode, $settings) { } /* Do not start an instance if we are not CARP master on this vip! */ - if (strstr($settings['interface'], "_vip") && get_carp_interface_status($settings['interface']) != "MASTER") { + if (strstr($settings['interface'], "_vip") && !in_array(get_carp_interface_status($settings['interface']), array("MASTER", ""))) { unlock($lockhandle); return; } @@ -1140,7 +1140,7 @@ function openvpn_restart($mode, $settings) { $a_groups = return_gateway_groups_array(); if (is_array($a_groups[$settings['interface']])) { /* the interface is a gateway group. If a vip is defined and its a CARP backup then do not start */ - if (($a_groups[$settings['interface']][0]['vip'] <> "") && (get_carp_interface_status($a_groups[$settings['interface']][0]['vip']) != "MASTER")) { + if (($a_groups[$settings['interface']][0]['vip'] <> "") && (!in_array(get_carp_interface_status($a_groups[$settings['interface']][0]['vip']), array("MASTER", "")))) { unlock($lockhandle); return; } |
