]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/dnsmasq/010-Rationalise_5e3e464ac4022ee0b3794513abe510817e2cf3ca.patch
bird: New package
[ipfire-2.x.git] / src / patches / dnsmasq / 010-Rationalise_5e3e464ac4022ee0b3794513abe510817e2cf3ca.patch
1 From 27b78d990b7cd901866ad6f1a17b9d633a95fdce Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Sat, 26 Sep 2015 21:40:45 +0100
4 Subject: [PATCH] Rationalise 5e3e464ac4022ee0b3794513abe510817e2cf3ca
5
6 ---
7 src/rfc3315.c | 3 +--
8 1 file changed, 1 insertion(+), 2 deletions(-)
9
10 diff --git a/src/rfc3315.c b/src/rfc3315.c
11 index 3f1f9ee..3ed8623 100644
12 --- a/src/rfc3315.c
13 +++ b/src/rfc3315.c
14 @@ -1324,8 +1324,7 @@ static struct dhcp_netid *add_options(struct state *state, int do_refresh)
15 if (opt_cfg->opt == OPTION6_DNS_SERVER)
16 done_dns = 1;
17
18 - /* Empty DNS_SERVER option will not set DHOPT_ADDR6 */
19 - if ((opt_cfg->flags & DHOPT_ADDR6) || opt_cfg->opt == OPTION6_DNS_SERVER)
20 + if (opt_cfg->flags & DHOPT_ADDR6)
21 {
22 int len, j;
23 struct in6_addr *a;
24 --
25 1.7.10.4
26