Browse Source

dnsmasq: fix handling ignore condition for dnssec

It should return false to indicate that the option should not be ignored

Fixes 064dc1e8 ("dnsmasq: abort when dnssec requested but not
available")

Reported-by: Sami Olmari <[email protected]>
Signed-off-by: Yousong Zhou <[email protected]>
Yousong Zhou 5 years ago
parent
commit
7dc78d1d28

+ 1 - 1
package/network/services/dnsmasq/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=dnsmasq
 PKG_UPSTREAM_VERSION:=2.82
 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

+ 1 - 0
package/network/services/dnsmasq/files/dnsmasq.init

@@ -48,6 +48,7 @@ dnsmasq_ignore_opt() {
 				echo "dnsmasq: \"$opt\" requested, but dnssec support is not available" >&2
 				exit 1
 			fi
+			return 1
 			;;
 		tftp-*)
 			[ -z "$dnsmasq_has_tftp" ] ;;