[openwrt/openwrt] dnsmasq: fix handling ignore condition for dnssec
LEDE Commits
lede-commits at lists.infradead.org
Thu Sep 24 22:32:17 EDT 2020
yousong pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7dc78d1d2893b672544e8c26026ce961a7248a82
commit 7dc78d1d2893b672544e8c26026ce961a7248a82
Author: Yousong Zhou <yszhou4tech at gmail.com>
AuthorDate: Fri Sep 25 10:28:19 2020 +0800
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 <sami at olmari.fi>
Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
package/network/services/dnsmasq/Makefile | 2 +-
package/network/services/dnsmasq/files/dnsmasq.init | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
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" ] ;;
More information about the lede-commits
mailing list