From bb46d659ddfb624044dd5b076dc67a404efe6f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Tue, 7 Jul 2009 15:43:00 +0000
Subject: Fix Bug #26. This can be easily backported to 1.2.x.

---
 etc/rc.filter_synchronize | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index 0459120..84d6b59 100644
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -88,45 +88,45 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens
         /* strip out nosync items */
         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']))
                         unset ($config_copy['nat']['advancedoutbound']['rule'][$x]);
-                $config_copy['nat']['advancedoutbound']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['advancedoutbound']['rule'][$x]['descr']);
         }
         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']))
                         unset ($config_copy['nat']['rule'][$x]);
-                $config_copy['nat']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['rule'][$x]['descr']);
         }
         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']))
                         unset ($config_copy['filter']['rule'][$x]);
-                $config_copy['filter']['rule'][$x]['descr'] = remove_special_characters($config_copy['filter']['rule'][$x]['descr']);
         }
         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']))
                         unset ($config_copy['aliases']['alias'][$x]);
-                $config_copy['aliases']['alias'][$x]['descr'] = remove_special_characters($config_copy['aliases']['alias'][$x]['descr']);
         }
         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']))
                         unset ($config_copy['dnsmasq']['hosts'][$x]);
-                $config_copy['dnsmasq']['hosts'][$x]['descr'] = remove_special_characters($config_copy['dnsmasq']['hosts'][$x]['descr']);
         }
         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")
                         unset ($config_copy['virtualip']['vip'][$x]);
-                $config_copy['virtualip']['vip'][$x]['descr'] = remove_special_characters($config_copy['virtualip']['vip'][$x]['descr']);
         }
         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']))
                         unset ($config_copy['ipsec']['tunnel'][$x]);
-                $config_copy['ipsec']['tunnel'][$x]['descr'] = remove_special_characters($config_copy['ipsec']['tunnel'][$x]['descr']);
         }
 
         foreach ($sections as $section) {
-- 
cgit v1.1