dnsmasq conf won't allow some custom args

User can't specify or customise some dnsmasq args in custom_options (dns-forward-max, cache-size, etc) because they are hard coded in services_dnsmasq_configure().

1 files changed, 16 insertions, 4 deletions

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 1458e1c..c01ce04 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1547,6 +1547,14 @@ function services_dnsmasq_configure() {
 	global $config, $g;
 	$return = 0;
 
+	// hard coded args: will be removed to avoid duplication if specified in custom_options
+	$standard_args = array(
+		"dns-forward-max" => "--dns-forward-max=5000",
+		"cache-size" => "--cache-size=10000",
+		"local-ttl" => "--local-ttl=1"
+	);
+
+
 	if(isset($config['system']['developerspew'])) {
 		$mt = microtime();
 		echo "services_dnsmasq_configure() being called $mt\n";
@@ -1644,13 +1652,17 @@ function services_dnsmasq_configure() {
 			$args .= " --domain-needed ";
 		}
 
-		if ($config['dnsmasq']['custom_options']) {
-			foreach (preg_split('/\s+/', $config['dnsmasq']['custom_options']) as $c)
+		if ($config['dnsmasq']['custom_options'])
+			foreach (preg_split('/\s+/', $config['dnsmasq']['custom_options']) as $c) {
 				$args .= " --$c";
-		}
+				$p = explode('=', $c);
+				if (array_key_exists($p[0], $standard_args))
+					unset($standard_args[$p[0]]);
+			}
+		$args .= implode(' ', array_values($standard_args));
 
 		/* run dnsmasq */
-		$cmd = "/usr/local/sbin/dnsmasq --local-ttl 1 --all-servers {$dns_rebind} --dns-forward-max=5000 --cache-size=10000 {$args}";
+		$cmd = "/usr/local/sbin/dnsmasq --all-servers {$dns_rebind} {$args}";
 		//log_error("dnsmasq command: {$cmd}");
 		mwexec_bg($cmd);
 		unset($args);