da1032254f265a0daf7aca0a93f10146345399c8
[openwrt/staging/ldir.git] / package / network / services / dnsmasq / patches / 0002-rfc3315-fix-incorrect-logical-warning.patch
1 From 84fe908e64a6e904166f728860ab8dfaa47850d2 Mon Sep 17 00:00:00 2001
2 From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
3 Date: Fri, 6 Mar 2020 10:28:09 +0000
4 Subject: [PATCH 2/2] rfc3315: fix incorrect logical '&&' warning
5
6 rfc3315.c:1711:28: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand]
7 if (!(addr_list->flags && ADDRLIST_DECLINED) ||
8 ^ ~~~~~~~~~~~~~~~~~
9
10 It's a flag bit so should be bitwise '&' operator
11
12 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
13 ---
14 src/rfc3315.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 --- a/src/rfc3315.c
18 +++ b/src/rfc3315.c
19 @@ -1708,7 +1708,7 @@ static int config_valid(struct dhcp_conf
20 return 0;
21
22 for (addr_list = config->addr6; addr_list; addr_list = addr_list->next)
23 - if (!(addr_list->flags && ADDRLIST_DECLINED) ||
24 + if (!(addr_list->flags & ADDRLIST_DECLINED) ||
25 difftime(now, addr_list->decline_time) >= (float)DECLINE_BACKOFF)
26 {
27 addrpart = addr6part(&addr_list->addr.addr6);