From 7c26752dfcef83d3b957b7127c309fc4ef2e3cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Fri, 9 Oct 2009 18:12:37 +0000
Subject: Revert "Use array_splice() to unset items that should not be sync'd
 (nosync)  Resolves #38"

This reverts commit d6e8dfa1d6b4bad7ef6f71263f275ca8e8b0a706.
---
 etc/rc.filter_synchronize | 42 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

(limited to 'etc')

diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index 519482b..182a1f1 100644
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -89,58 +89,44 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens
         if (is_array($config_copy['nat']['advancedoutbound']['rule']))
         for ($x = 0; $x < count($config_copy['nat']['advancedoutbound']['rule']); $x++) {
                 $config_copy['nat']['advancedoutbound']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['advancedoutbound']['rule'][$x]['descr']);
-                if (isset ($config_copy['nat']['advancedoutbound']['rule'][$x]['nosync'])) {
-                	array_splice($config_copy['nat']['advancedoutbound']['rule'],$x,1);
-                	$x--;
-				}
+                if (isset ($config_copy['nat']['advancedoutbound']['rule'][$x]['nosync']))
+                        unset ($config_copy['nat']['advancedoutbound']['rule'][$x]);
         }
         if (is_array($config_copy['nat']['rule']))
         for ($x = 0; $x < count($config_copy['nat']['rule']); $x++) {
                 $config_copy['nat']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['rule'][$x]['descr']);
-                if (isset ($config_copy['nat']['rule'][$x]['nosync'])) {
-                	array_splice($config_copy['nat']['rule'],$x,1);
-                	$x--;
-				}
+                if (isset ($config_copy['nat']['rule'][$x]['nosync']))
+                        unset ($config_copy['nat']['rule'][$x]);
         }
         if (is_array($config_copy['filter']['rule']))
         for ($x = 0; $x < count($config_copy['filter']['rule']); $x++) {
                 $config_copy['filter']['rule'][$x]['descr'] = remove_special_characters($config_copy['filter']['rule'][$x]['descr']);
-                if (isset ($config_copy['filter']['rule'][$x]['nosync'])) {
-                	array_splice($config_copy['filter']['rule'],$x,1);
-                	$x--;
-				}
+                if (isset ($config_copy['filter']['rule'][$x]['nosync']))
+                        unset ($config_copy['filter']['rule'][$x]);
         }
         if (is_array($config_copy['aliases']['alias']))
         for ($x = 0; $x < count($config_copy['aliases']['alias']); $x++) {
                 $config_copy['aliases']['alias'][$x]['descr'] = remove_special_characters($config_copy['aliases']['alias'][$x]['descr']);
-                if (isset ($config_copy['aliases']['alias'][$x]['nosync'])) {
-                	array_splice($config_copy['aliases']['alias'],$x,1);
-                	$x--;
-				}
+                if (isset ($config_copy['aliases']['alias'][$x]['nosync']))
+                        unset ($config_copy['aliases']['alias'][$x]);
         }
         if (is_array($config_copy['dnsmasq']['hosts']))
         for ($x = 0; $x < count($config_copy['dnsmasq']['hosts']); $x++) {
                 $config_copy['dnsmasq']['hosts'][$x]['descr'] = remove_special_characters($config_copy['dnsmasq']['hosts'][$x]['descr']);
-                if (isset ($config_copy['dnsmasq']['hosts'][$x]['nosync'])) {
-                	array_splice($config_copy['dnsmasq']['hosts'],$x,1);
-                	$x--;
-				}
+                if (isset ($config_copy['dnsmasq']['hosts'][$x]['nosync']))
+                        unset ($config_copy['dnsmasq']['hosts'][$x]);
         }
         if (is_array($config_copy['virtualip']['vip']))
         for ($x = 0; $x < count($config_copy['virtualip']['vip']); $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") {
-                	array_splice($config_copy['virtualip']['vip'],$x,1);
-                	$x--;
-				}
+                if (isset ($config_copy['virtualip']['vip'][$x]['nosync']) or $config_copy['virtualip']['vip'][$x]['mode'] == "proxyarp")
+                        unset ($config_copy['virtualip']['vip'][$x]);
         }
         if (is_array($config_copy['ipsec']['tunnel']))
         for ($x = 0; $x < count($config_copy['ipsec']['tunnel']); $x++) {
                 $config_copy['ipsec']['tunnel'][$x]['descr'] = remove_special_characters($config_copy['ipsec']['tunnel'][$x]['descr']);
-                if (isset ($config_copy['ipsec']['tunnel'][$x]['nosync'])) {
-                	array_splice($config_copy['ipsec']['tunnel'],$x,1);
-                	$x--;
-				}
+                if (isset ($config_copy['ipsec']['tunnel'][$x]['nosync']))
+                        unset ($config_copy['ipsec']['tunnel'][$x]);
         }
 
         foreach ($sections as $section) {
-- 
cgit v1.1