mirror of
https://github.com/pi-hole/dnsmasq.git
synced 2025-12-19 18:28:25 +00:00
Ignore ",," in dhcp-host, rather than treating it as ",0,"
This commit is contained in:
10
src/option.c
10
src/option.c
@@ -2732,7 +2732,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
char *cp, *lastp = NULL, last = 0;
|
char *cp, *lastp = NULL, last = 0;
|
||||||
int fac = 1;
|
int fac = 1, isdig = 0;
|
||||||
|
|
||||||
if (strlen(a[j]) > 1)
|
if (strlen(a[j]) > 1)
|
||||||
{
|
{
|
||||||
@@ -2763,9 +2763,11 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (cp = a[j]; *cp; cp++)
|
for (cp = a[j]; *cp; cp++)
|
||||||
if (!isdigit((unsigned char)*cp) && *cp != ' ')
|
if (isdigit((unsigned char)*cp))
|
||||||
|
isdig = 1;
|
||||||
|
else if (*cp != ' ')
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (*cp)
|
if (*cp)
|
||||||
{
|
{
|
||||||
if (lastp)
|
if (lastp)
|
||||||
@@ -2787,7 +2789,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
new->domain = strip_hostname(new->hostname);
|
new->domain = strip_hostname(new->hostname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else if (isdig)
|
||||||
{
|
{
|
||||||
new->lease_time = atoi(a[j]) * fac;
|
new->lease_time = atoi(a[j]) * fac;
|
||||||
/* Leases of a minute or less confuse
|
/* Leases of a minute or less confuse
|
||||||
|
|||||||
Reference in New Issue
Block a user