diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-03-06 11:23:34 +0000 |
---|---|---|
committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-03-06 15:47:56 +0000 |
commit | 0b84b892516942f1b78e53665168c81aaa7f5256 (patch) | |
tree | 914cd07d5cb7d17454078e70f867f640b139906a /package/network/services/dnsmasq/patches/0002-rfc3315-fix-incorrect-logical-warning.patch | |
parent | ca6885456fe2307d8cee850bd1c41e7ebfe74a38 (diff) | |
download | upstream-0b84b892516942f1b78e53665168c81aaa7f5256.tar.gz upstream-0b84b892516942f1b78e53665168c81aaa7f5256.tar.bz2 upstream-0b84b892516942f1b78e53665168c81aaa7f5256.zip |
dnsmasq: bump to 2.81rc2 + 2 local
Bump to dnsmasq 2.81rc2. In the process discovered several compiler
warnings one with a logical error.
2 relevant patches sent upstream, added as 2 local patches for OpenWrt
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0002-rfc3315-fix-incorrect-logical-warning.patch')
-rw-r--r-- | package/network/services/dnsmasq/patches/0002-rfc3315-fix-incorrect-logical-warning.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0002-rfc3315-fix-incorrect-logical-warning.patch b/package/network/services/dnsmasq/patches/0002-rfc3315-fix-incorrect-logical-warning.patch new file mode 100644 index 0000000000..da1032254f --- /dev/null +++ b/package/network/services/dnsmasq/patches/0002-rfc3315-fix-incorrect-logical-warning.patch @@ -0,0 +1,27 @@ +From 84fe908e64a6e904166f728860ab8dfaa47850d2 Mon Sep 17 00:00:00 2001 +From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> +Date: Fri, 6 Mar 2020 10:28:09 +0000 +Subject: [PATCH 2/2] rfc3315: fix incorrect logical '&&' warning + +rfc3315.c:1711:28: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand] + if (!(addr_list->flags && ADDRLIST_DECLINED) || + ^ ~~~~~~~~~~~~~~~~~ + +It's a flag bit so should be bitwise '&' operator + +Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> +--- + src/rfc3315.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/rfc3315.c ++++ b/src/rfc3315.c +@@ -1708,7 +1708,7 @@ static int config_valid(struct dhcp_conf + return 0; + + for (addr_list = config->addr6; addr_list; addr_list = addr_list->next) +- if (!(addr_list->flags && ADDRLIST_DECLINED) || ++ if (!(addr_list->flags & ADDRLIST_DECLINED) || + difftime(now, addr_list->decline_time) >= (float)DECLINE_BACKOFF) + { + addrpart = addr6part(&addr_list->addr.addr6); |