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
b5a8dd1d
Commit
b5a8dd1d
authored
Dec 10, 2012
by
Simon Kelley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix FTBFS with NO_DHCP.
parent
95a0bd37
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
18 deletions
+22
-18
CHANGELOG
CHANGELOG
+4
-0
src/option.c
src/option.c
+18
-18
No files found.
CHANGELOG
View file @
b5a8dd1d
...
...
@@ -3,6 +3,10 @@ version 2.65
TCP which are not for A and AAAA and which were directed to
non-default servers. Thanks to Niax for the bug report.
Fix failure to build with DHCP support excluded. Thanks to
Gustavo Zacarias for the patch.
version 2.64
Handle DHCP FQDN options with all flag bits zero and
--dhcp-client-update set. Thanks to Bernd Krumbroeck for
...
...
src/option.c
View file @
b5a8dd1d
...
...
@@ -623,24 +623,6 @@ static void do_usage(void)
#define ret_err(x) do { strcpy(errstr, (x)); return 0; } while (0)
#ifdef HAVE_DHCP
static
int
is_tag_prefix
(
char
*
arg
)
{
if
(
arg
&&
(
strstr
(
arg
,
"net:"
)
==
arg
||
strstr
(
arg
,
"tag:"
)
==
arg
))
return
1
;
return
0
;
}
static
char
*
set_prefix
(
char
*
arg
)
{
if
(
strstr
(
arg
,
"set:"
)
==
arg
)
return
arg
+
4
;
return
arg
;
}
char
*
parse_server
(
char
*
arg
,
union
mysockaddr
*
addr
,
union
mysockaddr
*
source_addr
,
char
*
interface
,
int
*
flags
)
{
int
source_port
=
0
,
serv_port
=
NAMESERVER_PORT
;
...
...
@@ -728,6 +710,24 @@ char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_a
return
NULL
;
}
#ifdef HAVE_DHCP
static
int
is_tag_prefix
(
char
*
arg
)
{
if
(
arg
&&
(
strstr
(
arg
,
"net:"
)
==
arg
||
strstr
(
arg
,
"tag:"
)
==
arg
))
return
1
;
return
0
;
}
static
char
*
set_prefix
(
char
*
arg
)
{
if
(
strstr
(
arg
,
"set:"
)
==
arg
)
return
arg
+
4
;
return
arg
;
}
/* This is too insanely large to keep in-line in the switch */
static
int
parse_dhcp_opt
(
char
*
errstr
,
char
*
arg
,
int
flags
)
{
...
...
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