mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-17 19:31:09 +00:00
Merge branch 'master' of ssh://thekelleys.org.uk/var/local/git/dnsmasq
This commit is contained in:
2 files changed
+8
-8
No files matched your search
+1
-1
@@ -777,7 +777,7 @@ will add 1.2.3.0/24 for both IPv4 and IPv6 requestors.
|
|||||||
.TP
|
.TP
|
||||||
.B --strip-subnet
|
.B --strip-subnet
|
||||||
Remove any subnet address already present in a downstream query before forwarding it upstream. If --add-subnet is set this also
|
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.
|
existing subnet in the query.
|
||||||
.TP
|
.TP
|
||||||
.B --umbrella[=[deviceid:<deviceid>][,orgid:<orgid>][,assetid:<id>]]
|
.B --umbrella[=[deviceid:<deviceid>][,orgid:<orgid>][,assetid:<id>]]
|
||||||
|
|||||||
+7
-7
@@ -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))
|
if (!strtoul_check(arg+6, &daemon->umbrella_org))
|
||||||
ret_err(gen_err);
|
ret_err(gen_err);
|
||||||
}
|
}
|
||||||
else if (strstr(arg, "assetid:"))
|
else if (strstr(arg, "assetid:"))
|
||||||
{
|
{
|
||||||
if (!strtoul_check(arg+8, &daemon->umbrella_asset))
|
if (!strtoul_check(arg+8, &daemon->umbrella_asset))
|
||||||
ret_err(gen_err);
|
ret_err(gen_err);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
ret_err(gen_err);
|
ret_err(gen_err);
|
||||||
|
|
||||||
arg = comma;
|
arg = comma;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user