dnsmasq strict order/all servers are mutually exclusive. Fixes #13655

jargonTSD · Apr 12, 2023 · f48271e · f48271e
1 parent e90ba64
commit f48271e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
@@ -2639,6 +2639,8 @@ function services_dnsmasq_configure($restart_dhcp = true) {
 
 		if (config_path_enabled('dnsmasq','strict_order')) {
 			$args .= " --strict-order ";
+		} else {
+			$args .= " --all-servers ";
 		}
 
 		if (config_path_enabled('dnsmasq','domain_needed')) {
@@ -2658,7 +2660,7 @@ function services_dnsmasq_configure($restart_dhcp = true) {
 		$args .= ' ' . implode(' ', array_values($standard_args));
 
 		/* run dnsmasq. Use "-C /dev/null" since we use command line args only (Issue #6730) */
-		$cmd = "/usr/local/sbin/dnsmasq --all-servers -C /dev/null {$dns_rebind} {$args}";
+		$cmd = "/usr/local/sbin/dnsmasq -C /dev/null {$dns_rebind} {$args}";
 		//log_error("dnsmasq command: {$cmd}");
 		mwexec_bg($cmd);
 		unset($args);