Do not reconfigure dhcpd twice on secondary after config sync. Fixes #3797

1 files changed, 5 insertions, 1 deletions

diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 5c6fdba..dc9e277 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -370,11 +370,15 @@ function filter_configure_xmlrpc($raw_params) {
 	relayd_configure();
 	require_once("openvpn.inc");
 	openvpn_resync_all();
-	services_dhcpd_configure();
 	if (isset($config['dnsmasq']['enable']))
 		services_dnsmasq_configure();
 	elseif (isset($config['unbound']['enable']))
 		services_unbound_configure();
+	else
+		# Both calls above run services_dhcpd_configure(), then we just
+		# need to call it when them are not called to avoid restart dhcpd
+		# twice, as described on ticket #3797
+		services_dhcpd_configure();
 	local_sync_accounts();
 
 	return $xmlrpc_g['return']['true'];