diff options
| author | Ermal <eri@pfsense.org> | 2013-11-28 18:36:03 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-11-28 18:36:18 +0000 |
| commit | 7238e0cfc840d175e5b0dd650730fc21b6a9b368 (patch) | |
| tree | 7a3b20dd35ddf6019eb61f612d10711de12c03e4 /etc/inc/vpn.inc | |
| parent | d11134243489f7cea17cdc4c04a0624b0c16ed18 (diff) | |
| download | pfsense-7238e0cfc840d175e5b0dd650730fc21b6a9b368.zip pfsense-7238e0cfc840d175e5b0dd650730fc21b6a9b368.tar.gz | |
Remove references to _vip interface and provide proper configuration for carp on FreeBSD 10. Still some places to deal with this and certainly missing upgrade code
Diffstat (limited to 'etc/inc/vpn.inc')
| -rw-r--r-- | etc/inc/vpn.inc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 62d997c..6d31b50 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -907,13 +907,8 @@ EOD; /* static route needed? */ if (is_ipaddr($ph1ent['interface'])) { $vip = find_virtual_ip_alias($ph1ent['interface']); - if (preg_match("/^carp|^[a-z0-9]+_vip/i", $vip['interface'])) - $parentinterface = link_carp_interface_to_parent($vip['interface']); - else - $parentinterface = $vip['interface']; - } else if (preg_match("/^carp|^[a-z0-9]+_vip/i", $ph1ent['interface'])) - $parentinterface = link_carp_interface_to_parent($ph1ent['interface']); - else + $parentinterface = $vip['interface']; + } else $parentinterface = $ph1ent['interface']; if (is_ipaddr($rgip)) { |
