Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix option parsing for --dhcp-host.

Browse Source
This commit is contained in:
Simon Kelley
2013-05-29 14:31:33 +01:00
parent 48493329d6
commit 3e8ed78bf1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -40,6 +40,10 @@ version 2.67
Generalise --interface-name to cope with IPv6 addresses Generalise --interface-name to cope with IPv6 addresses
and multiple addresses per interface per address family. and multiple addresses per interface per address family.
Fix option parsing for --dhcp-host, which was generating a
spurious error when all seven possible items were
included. Thanks to Zhiqiang Wang for the bug report.
version 2.66 version 2.66
Add the ability to act as an authoritative DNS Add the ability to act as an authoritative DNS

4
src/option.c
View File

@@ -2510,7 +2510,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
case 'G': /* --dhcp-host */ case 'G': /* --dhcp-host */
{ {
int j, k = 0; int j, k = 0;
char *a[6] = { NULL, NULL, NULL, NULL, NULL, NULL }; char *a[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
struct dhcp_config *new; struct dhcp_config *new;
struct in_addr in; struct in_addr in;
@@ -2522,7 +2522,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
new->netid = NULL; new->netid = NULL;
if ((a[0] = arg)) if ((a[0] = arg))
for (k = 1; k < 6; k++) for (k = 1; k < 7; k++)
if (!(a[k] = split(a[k-1]))) if (!(a[k] = split(a[k-1])))
break; break;