mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
cb9d5f0a7c
Refresh patches and backport upstream to current HEAD:
a997ca0 Fix sometimes missing DNSSEC RRs when DNSSEC validation not enabled.
51e4eee Fix address-dependent domains for IPv6.
05ff659 Fix stupid infinite loop introduced by preceding commit.
db0f488 Handle some corner cases in RA contructed interfaces with addresses changing interface.
7dcca6c Warn about the impact of cache-size on performance.
090856c Allow zone transfer in authoritative mode whenever auth-peer is specified.
cc5cc8f Sane error message when pcap file header is wrong.
c488b68 Handle standard and contructed dhcp-ranges on the same interface.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit fbf475403b
)
25 lines
780 B
Diff
25 lines
780 B
Diff
From 51e4eeeb04b8dd8510ed267d580751525e77cb77 Mon Sep 17 00:00:00 2001
|
|
From: Paul Maddock <Paul@whitefall.co.uk>
|
|
Date: Tue, 12 Jun 2018 16:37:40 +0100
|
|
Subject: [PATCH 17/17] Fix address-dependent domains for IPv6.
|
|
|
|
Thanks to Paul Maddock for spotting this.
|
|
It seems to have been broken forever.
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/lease.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/src/lease.c
|
|
+++ b/src/lease.c
|
|
@@ -87,7 +87,7 @@ static int read_leases(time_t now, FILE
|
|
if ((lease = lease6_allocate(&addr.addr.addr6, lease_type)))
|
|
{
|
|
lease_set_iaid(lease, strtoul(s, NULL, 10));
|
|
- domain = get_domain6((struct in6_addr *)lease->hwaddr);
|
|
+ domain = get_domain6(&lease->addr6);
|
|
}
|
|
}
|
|
#endif
|