From: Yousong Zhou Date: Fri, 25 Sep 2020 02:28:19 +0000 (+0800) Subject: dnsmasq: fix handling ignore condition for dnssec X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7dc78d1d2893b672544e8c26026ce961a7248a82;p=openwrt%2Fstaging%2Fnbd.git 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 Signed-off-by: Yousong Zhou --- diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index b5f2e78fd2..fe68378f48 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/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 diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index d387c90285..0fa3074f92 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/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" ] ;;