From c565c45b4e136e102a950fa57f29ebd723c72378 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Thu, 2 Feb 2006 00:22:12 +0000
Subject: [PATCH] Do not sync items marked with <nosync/>

---
 etc/inc/filter.inc | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 7c358b66b1..e9125f91c3 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2056,6 +2056,21 @@ function process_carp_rules() {
 
 function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsense.restore_config_section') {
 	global $config, $g;
+	$config_copy = $config;
+
+	/* strip out nosync items */
+	for($x=0; $x<count($config_copy['nat']['advancedoutbound']['rule']); $x++) {
+		if(isset($config_copy['nat']['advancedoutbound']['rule'][$x]['nosync']))
+			unset($config_copy['nat']['advancedoutbound']['rule'][$x]['nosync']);
+	}
+	for($x=0; $x<count($config_copy['nat']['rule']); $x++) {
+		if(isset($config_copy['nat']['rule'][$x]['nosync']))
+			unset($config_copy['nat']['rule'][$x]['nosync']);
+	}
+	for($x=0; $x<count($config_copy['filter']['rule']); $x++) {
+		if(isset($config_copy['filter']['rule'][$x]['nosync']))
+			unset($config_copy['filter']['rule'][$x]['nosync']);
+	}
 
 	if($g['booting'])
 		return;
@@ -2064,7 +2079,7 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens
 		/* we can't use array_intersect_key()
 		   due to the vip 'special case' */
 		if($section != 'virtualip') {
-			$xml[$section] = $config[$section];
+			$xml[$section] = $config_copy[$section];
 		} else {
 			$xml[$section] = backup_vip_config_section();
 		}