From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 23 Mar 2012 11:19:56 +0000 (+0000)
Subject: dnsmasq: add keywords for SRV RR class/weight
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=37478505352048f07f408c3fabc174520fb5a238;p=librecmc%2Flibrecmc.git

dnsmasq: add keywords for SRV RR class/weight

The SRV record also requires the class and weight fields... Currently you can overload the "port" keyword as:

	option port xxxx,class,weight

but this is counter-intuitive. Here we fix this.

Redux: make the port required.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

SVN-Revision: 31056
---

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index b0c2cd226f..13f178384a 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -360,9 +360,12 @@ dhcp_srv_add() {
 	[ -n "$target" ] || return 0
 
 	config_get port "$cfg" port
+	[ -n "$port" ] || return 0
 
-	local service="$srv,$target"
-	[ -n "$port" ] && service="$service,$port"
+	config_get class "$cfg" class
+	config_get weight "$cfg" weight
+
+	local service="$srv,$target,$port${class:+,$class${weight:+,$weight}}"
 
 	append args "-W $service"
 }