From 8a98ce811ca6cea8d0c70082323b9a188e75b7b7 Mon Sep 17 00:00:00 2001 From: pierrepomes Date: Mon, 18 Oct 2010 15:58:32 -0400 Subject: ipalias type should be handled in backup_vip_config_section. Remove useless code which copies vip section before call to backup_vip_config_section. Ticket #882 --- etc/rc.filter_synchronize | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 5182f30..34cc7e8 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -51,7 +51,7 @@ function backup_vip_config_section() { global $config; $new_section = &$config['virtualip']; foreach($new_section['vip'] as $section) { - if($section['mode'] == "proxyarp") { + if($section['mode'] == "proxyarp" || $section['mode'] == "ipalias") { unset($section); } if($section['advskew'] <> "") { @@ -130,16 +130,6 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens unset ($config_copy['dnsmasq']['hosts'][$x]); } } - if (is_array($config_copy['virtualip']['vip'])) { - $vipcnt = count($config_copy['virtualip']['vip']); - for ($x = 0; $x < $vipcnt; $x++) { - $config_copy['virtualip']['vip'][$x]['descr'] = remove_special_characters($config_copy['virtualip']['vip'][$x]['descr']); - if (isset ($config_copy['virtualip']['vip'][$x]['nosync']) or - $config_copy['virtualip']['vip'][$x]['mode'] == "proxyarp" or - $config_copy['virtualip']['vip'][$x]['mode'] == "ipalias") - unset ($config_copy['virtualip']['vip'][$x]); - } - } if (is_array($config_copy['ipsec']['tunnel'])) { $ipseccnt = count($config_copy['ipsec']['tunnel']); for ($x = 0; $x < $ipseccnt; $x++) { -- cgit v1.1