dnsmasq: backport latest patches
[oweals/openwrt.git] / package / network / services / dnsmasq / patches / 0014-Fix-option-parsing-errors-introduced-in-59e470381f84.patch
1 From 137e9f878fafb38369eab7d9dfe84e4228ff5f89 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
3 Date: Sun, 16 Dec 2018 21:25:29 +0000
4 Subject: [PATCH 14/57] Fix option parsing errors introduced in
5  59e470381f84f2fdf0640c7bc67827f3f0c64784
6
7 Thanks to Kevin Darbyshire-Bryant for spotting this.
8
9 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
10 ---
11  src/option.c | 6 +++---
12  1 file changed, 3 insertions(+), 3 deletions(-)
13
14 --- a/src/option.c
15 +++ b/src/option.c
16 @@ -3432,7 +3432,7 @@ static int one_opt(int option, char *arg
17        {
18         struct dhcp_netid *id = dhcp_tags(&arg);
19         
20 -       if (!id)
21 +       if (!arg)
22           {
23             ret_err(gen_err);
24           }
25 @@ -3483,7 +3483,7 @@ static int one_opt(int option, char *arg
26        {
27         struct dhcp_netid *id = dhcp_tags(&arg);
28         
29 -       if (!id)
30 +       if (!arg)
31           {
32             ret_err(gen_err);
33           }
34 @@ -3513,7 +3513,7 @@ static int one_opt(int option, char *arg
35          new->opt = 10; /* PXE_MENU_PROMPT */
36          new->netid = dhcp_tags(&arg);
37          
38 -        if (!new->netid)
39 +        if (!arg)
40            {
41              dhcp_opt_free(new);
42              ret_err(gen_err);