Some sections should just be copied and not merged or we end up unable to sync the deletion of the last item in a section.

1 files changed, 14 insertions, 1 deletions

diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index de0d206..49c05a3 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -170,6 +170,19 @@ function restore_config_section_xmlrpc($raw_params) {
 		xmlrpc_authfail();
 		return $xmlrpc_g['return']['authfail'];
 	}
+
+	// Some sections should just be copied and not merged or we end
+	//   up unable to sync the deletion of the last item in a section
+	$sync_full = array('ipsec', 'aliases', 'wol', 'load_balancer', 'openvpn', 'cert', 'ca', 'crl', 'schedules');
+	$sync_full_done = array();
+	foreach ($sync_full as $syncfull) {
+		if (isset($params[0][$syncfull])) {
+			$config[$syncfull] = $params[0][$syncfull];
+			unset($params[0][$syncfull]);
+			$sync_full_done[] = $syncfull;
+		}
+	}
+
 	$vipbackup = array();
 	$oldvips = array();
 	if (isset($params[0]['virtualip'])) {
@@ -199,7 +212,7 @@ function restore_config_section_xmlrpc($raw_params) {
 	}
 
 	/* Log what happened */
-	$mergedkeys = implode(",", array_keys($params[0]));
+	$mergedkeys = implode(",", array_merge(array_keys($params[0]), $sync_full_done));
 	write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys));
 
 	/*