aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dnsmasq/files
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2015-04-10 10:19:17 +0000
committerSteven Barth <cyrus@openwrt.org>2015-04-10 10:19:17 +0000
commit747c33859b10388e0eb1d37ff2a58ee7837a6f7a (patch)
treedfd1c3d8e07fa364c6f8230081ef236045733589 /package/network/services/dnsmasq/files
parent9d6e04a4f171cbf6acb8ad33b5a58fb39c9cab30 (diff)
downloadupstream-747c33859b10388e0eb1d37ff2a58ee7837a6f7a.tar.gz
upstream-747c33859b10388e0eb1d37ff2a58ee7837a6f7a.tar.bz2
upstream-747c33859b10388e0eb1d37ff2a58ee7837a6f7a.zip
dnsmasq: bump to 2.73rc4
Fix crash caused by malformed DNS requests Improved DNSSEC handling Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 45354
Diffstat (limited to 'package/network/services/dnsmasq/files')
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init7
1 files changed, 6 insertions, 1 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 20333c810a..b2dfb979bc 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -205,6 +205,7 @@ dnsmasq() {
[ "$dnssec" -gt 0 ] && {
xappend "--conf-file=$TRUSTANCHORSFILE"
xappend "--dnssec"
+ xappend "--dnssec-timestamp=/etc/dnsmasq.time"
append_bool "$cfg" dnsseccheckunsigned "--dnssec-check-unsigned"
}
@@ -555,7 +556,7 @@ start_service() {
procd_add_jail dnsmasq ubus log
procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE /etc/passwd /dev/urandom /etc/dnsmasq.conf /tmp/dnsmasq.d /tmp/resolv.conf.auto /etc/hosts /etc/ethers
- procd_add_jail_mount_rw /var/run/dnsmasq/ /tmp/dhcp.leases
+ procd_add_jail_mount_rw /var/run/dnsmasq/ /tmp/dhcp.leases /etc/dnsmasq.time
procd_close_instance
@@ -565,6 +566,10 @@ start_service() {
mkdir -p /var/lib/misc
touch /tmp/dhcp.leases
+ if [ ! -f /etc/dnsmasq.time ]; then
+ touch -t 197001010000 /etc/dnsmasq.time
+ chmod 0777 /etc/dnsmasq.time
+ fi
echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE
echo "# auto-generated config file from /etc/config/dhcp" > $HOSTFILE