diff options
author | jim-p <jimp@pfsense.org> | 2012-05-08 18:21:50 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2012-05-08 18:22:12 -0400 |
commit | 30274157b2361f0fac14f0eaa86ae08dc02678a7 (patch) | |
tree | 8ff7de6cb0087db653ca09999c267f4619c4c0b7 /etc/rc.filter_synchronize | |
parent | 8a4b381f579a8b5ee67aab4c4f3964cdc64fec92 (diff) | |
download | pfsense-30274157b2361f0fac14f0eaa86ae08dc02678a7.zip pfsense-30274157b2361f0fac14f0eaa86ae08dc02678a7.tar.gz |
Revert "Make vips vhid be unique per parent interface!" - per cmb, this should not have been on RELENG_2_0 see ticket #2415
This reverts commit 4d0c032c528b10221a2ef894b5eca34f6fda39a7.
Conflicts:
etc/inc/openvpn.inc
etc/inc/upgrade_config.inc
etc/rc.filter_synchronize
Diffstat (limited to 'etc/rc.filter_synchronize')
-rwxr-xr-x | etc/rc.filter_synchronize | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 46e5c33..b98b683 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -55,7 +55,7 @@ function backup_vip_config_section() { $temp = array(); $temp['vip'] = array(); foreach($config['virtualip']['vip'] as $section) { - if(($section['mode'] == "proxyarp" || $section['mode'] == "ipalias") && !strstr($section['interface'], "_vip")) + if(($section['mode'] == "proxyarp" || $section['mode'] == "ipalias") && substr($section['interface'],0,3) != "vip") continue; if($section['advskew'] <> "") { $section_val = intval($section['advskew']); |