From a3293bb2428dfe462532bd5f449815d8be121c65 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Fri, 21 Jan 2022 12:07:42 +0000 Subject: [PATCH 1/2] Fix indentation in Umbrella option code. --- src/option.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/option.c b/src/option.c index 6942432..5230eaf 100644 --- a/src/option.c +++ b/src/option.c @@ -2537,13 +2537,13 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma arg += 9; if (strlen(arg) != 16) ret_err(gen_err); - + for (p = arg; *p; p++) if (!isxdigit((int)*p)) ret_err(gen_err); - + set_option_bool(OPT_UMBRELLA_DEVID); - + for (i = 0; i < (int)sizeof(daemon->umbrella_device); i++, arg+=2) { memcpy(word, &(arg[0]), 2); @@ -2555,13 +2555,13 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma if (!strtoul_check(arg+6, &daemon->umbrella_org)) ret_err(gen_err); } - else if (strstr(arg, "assetid:")) - { - if (!strtoul_check(arg+8, &daemon->umbrella_asset)) - ret_err(gen_err); - } - else - ret_err(gen_err); + else if (strstr(arg, "assetid:")) + { + if (!strtoul_check(arg+8, &daemon->umbrella_asset)) + ret_err(gen_err); + } + else + ret_err(gen_err); arg = comma; } From b18e9c8c619958395333e1e0cf58c8330f91662c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 19 Jan 2022 14:58:50 +0100 Subject: [PATCH 2/2] fix dnsmasq typo in man page Fixes commit 27ce754b3d7f2f0c297b0cede6b7ae57b0a0a0a5 Signed-off-by: Olaf Hering --- man/dnsmasq.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 index 0d53474..9af4ec8 100644 --- a/man/dnsmasq.8 +++ b/man/dnsmasq.8 @@ -777,7 +777,7 @@ will add 1.2.3.0/24 for both IPv4 and IPv6 requestors. .TP .B --strip-subnet Remove any subnet address already present in a downstream query before forwarding it upstream. If --add-subnet is set this also -ensures that any downstream-provided subnet is replaced by the one added by dnsmasq. Otherwise, dnsmaaq will NOT replace an +ensures that any downstream-provided subnet is replaced by the one added by dnsmasq. Otherwise, dnsmasq will NOT replace an existing subnet in the query. .TP .B --umbrella[=[deviceid:][,orgid:][,assetid:]]