aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dnsmasq/patches/0042-Remove-unclear-gcc-ism-in-conditional-expression.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-03-09 08:40:57 +0000
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-07-25 12:23:46 +0100
commite9eec39aacde450ba87598d85987b374ce6aed95 (patch)
tree3823546edc4d7228951ea9e37f55f6fea3f06833 /package/network/services/dnsmasq/patches/0042-Remove-unclear-gcc-ism-in-conditional-expression.patch
parent7d684b7673a7cb4f3fef366dd4f621f62fc4019c (diff)
downloadupstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.gz
upstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.bz2
upstream-e9eec39aacde450ba87598d85987b374ce6aed95.zip
dnsmasq: backport latest patches
Backport upstream patches pre 2.81rc for testing purposes. Let's see what falls out! Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0042-Remove-unclear-gcc-ism-in-conditional-expression.patch')
-rw-r--r--package/network/services/dnsmasq/patches/0042-Remove-unclear-gcc-ism-in-conditional-expression.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0042-Remove-unclear-gcc-ism-in-conditional-expression.patch b/package/network/services/dnsmasq/patches/0042-Remove-unclear-gcc-ism-in-conditional-expression.patch
new file mode 100644
index 0000000000..853602f471
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0042-Remove-unclear-gcc-ism-in-conditional-expression.patch
@@ -0,0 +1,21 @@
+From 5ed82ae5f2946367b62f17fa4c48e9703f189c72 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Tue, 5 Mar 2019 16:38:34 +0000
+Subject: [PATCH 42/57] Remove unclear gcc-ism in conditional expression.
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ src/radv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/radv.c
++++ b/src/radv.c
+@@ -412,7 +412,7 @@ static void send_ra_alias(time_t now, in
+ if (mtu == 0)
+ {
+ char *mtu_name = ra_param ? ra_param->mtu_name : NULL;
+- sprintf(daemon->namebuff, "/proc/sys/net/ipv6/conf/%s/mtu", mtu_name ? : iface_name);
++ sprintf(daemon->namebuff, "/proc/sys/net/ipv6/conf/%s/mtu", mtu_name ? mtu_name : iface_name);
+ if ((f = fopen(daemon->namebuff, "r")))
+ {
+ if (fgets(daemon->namebuff, MAXDNAME, f))