Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
Dnsmasq
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Dnsmasq
Commits
3e8ed78b
Commit
3e8ed78b
authored
May 29, 2013
by
Simon Kelley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix option parsing for --dhcp-host.
parent
48493329
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG
CHANGELOG
+4
-0
src/option.c
src/option.c
+2
-2
No files found.
CHANGELOG
View file @
3e8ed78b
...
@@ -40,6 +40,10 @@ version 2.67
...
@@ -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
...
...
src/option.c
View file @
3e8ed78b
...
@@ -2510,7 +2510,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
...
@@ -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
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment