From 60ffb74043840e6ddcd21189db50cd3cfce115e8 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sat, 26 Jun 2021 00:01:11 +0200
Subject: [PATCH] xmlrpc-sync: lock config writes during merge.

This might prevent race conditions while the user interface is trying to save data at the same time the xmlrpc client pushes new data. Need some further testing.
---
 src/etc/inc/xmlrpc/legacy.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc
index 186213d6e..7182b68f2 100644
--- a/src/etc/inc/xmlrpc/legacy.inc
+++ b/src/etc/inc/xmlrpc/legacy.inc
@@ -137,6 +137,8 @@ function filter_configure_xmlrpc()
 function restore_config_section_xmlrpc($new_config)
 {
     global $config;
+    // lock config write during merge
+    OPNsense\Core\Config::getInstance()->lock();
 
     require_once("interfaces.inc");
     require_once("filter.inc");