From 38000b3acbf89cf070abfffe30d1cec67dfa66e7 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 19 Feb 2015 12:41:17 +0000
Subject: [PATCH] dns forwarder reload flushed setting
 (https://github.com/opnsense/core/issues/37) changed post handling for apply
 button.

---
 src/www/services_dnsmasq.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index 6da489322..dd1e24689 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -57,7 +57,7 @@ if (!is_array($config['dnsmasq']['domainoverrides']))
 $a_hosts = &$config['dnsmasq']['hosts'];
 $a_domainOverrides = &$config['dnsmasq']['domainoverrides'];
 
-if ($_POST) {
+if ($_POST && isset($_POST['submit'])) {
 
 	$pconfig = $_POST;
 	unset($input_errors);
@@ -96,19 +96,20 @@ if ($_POST) {
 
 	if (!$input_errors) {
 		write_config();
-
-		$retval = 0;
 		$retval = services_dnsmasq_configure();
 		$savemsg = get_std_save_message($retval);
+	}
+} elseif ($_POST && isset($_POST['apply']) ) {
 
-		// Relaod filter (we might need to sync to CARP hosts)
+		// Reload filter (we might need to sync to CARP hosts)
 		filter_configure();
 		/* Update resolv.conf in case the interface bindings exclude localhost. */
 		system_resolvconf_generate();
-
+		$retval = services_dnsmasq_configure();
+		$savemsg = get_std_save_message($retval);
 		if ($retval == 0)
 			clear_subsystem_dirty('hosts');
-	}
+
 }
 
 if ($_GET['act'] == "del") {