e4e363ba475a593ffd663dcfaee731deebc50931
[openwrt/staging/luka.git] / package / network / services / dnsmasq / patches / 0016-build-failure-on-master-with-NO_DHCPv6-and-fix.patch
1 From b683cf37f9f3dd3dc5d95d621ee75850d559b2e4 Mon Sep 17 00:00:00 2001
2 From: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
3 Date: Mon, 10 Dec 2018 10:34:35 +0000
4 Subject: [PATCH 16/32] build failure on master with NO_DHCPv6 and fix....
5
6 Hi Simon,
7
8 master has a build error when building without HAVE_DHCPv6
9
10 option.c: In function 'dhcp_context_free':
11 option.c:1042:15: error: 'struct dhcp_context' has no member named 'template_interface'
12 free(ctx->template_interface);
13
14 Sadly, need to put in a little conditional compilation ifdef'erey
15
16 Simplest patch in the world attached
17
18 Cheers,
19
20 Kevin D-B
21
22 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A
23
24 From 061eb8599636bb360e0b7fa5986935b86db39497 Mon Sep 17 00:00:00 2001
25 From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
26 Date: Mon, 10 Dec 2018 10:07:33 +0000
27 Subject: [PATCH] option: fix non DHCPv6 build error
28
29 option.c: In function 'dhcp_context_free':
30 option.c:1042:15: error: 'struct dhcp_context' has no member named 'template_interface'
31 free(ctx->template_interface);
32 ^~
33
34 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
35 ---
36 src/option.c | 2 ++
37 1 file changed, 2 insertions(+)
38
39 --- a/src/option.c
40 +++ b/src/option.c
41 @@ -1039,7 +1039,9 @@ static void dhcp_context_free(struct dhc
42 {
43 dhcp_netid_free(ctx->filter);
44 free(ctx->netid.net);
45 +#ifdef HAVE_DHCP6
46 free(ctx->template_interface);
47 +#endif
48 free(ctx);
49 }
50 }