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
91543f48
Commit
91543f48
authored
Sep 23, 2013
by
Simon Kelley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix FTBFS when various facilities omitted at compile time.
parent
d81b42d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
src/lease.c
src/lease.c
+8
-1
src/network.c
src/network.c
+3
-1
src/tftp.c
src/tftp.c
+0
-2
No files found.
src/lease.c
View file @
91543f48
...
@@ -462,7 +462,6 @@ void lease_update_dns(int force)
...
@@ -462,7 +462,6 @@ void lease_update_dns(int force)
cache_add_dhcp_entry
(
lease
->
hostname
,
AF_INET6
,
(
struct
all_addr
*
)
&
slaac
->
addr
,
lease
->
expires
);
cache_add_dhcp_entry
(
lease
->
hostname
,
AF_INET6
,
(
struct
all_addr
*
)
&
slaac
->
addr
,
lease
->
expires
);
}
}
}
}
#endif
if
(
lease
->
fqdn
)
if
(
lease
->
fqdn
)
cache_add_dhcp_entry
(
lease
->
fqdn
,
prot
,
cache_add_dhcp_entry
(
lease
->
fqdn
,
prot
,
...
@@ -473,6 +472,14 @@ void lease_update_dns(int force)
...
@@ -473,6 +472,14 @@ void lease_update_dns(int force)
cache_add_dhcp_entry
(
lease
->
hostname
,
prot
,
cache_add_dhcp_entry
(
lease
->
hostname
,
prot
,
prot
==
AF_INET
?
(
struct
all_addr
*
)
&
lease
->
addr
:
(
struct
all_addr
*
)
&
lease
->
addr6
,
prot
==
AF_INET
?
(
struct
all_addr
*
)
&
lease
->
addr
:
(
struct
all_addr
*
)
&
lease
->
addr6
,
lease
->
expires
);
lease
->
expires
);
#else
if
(
lease
->
fqdn
)
cache_add_dhcp_entry
(
lease
->
fqdn
,
prot
,
(
struct
all_addr
*
)
&
lease
->
addr
,
lease
->
expires
);
if
(
!
option_bool
(
OPT_DHCP_FQDN
)
&&
lease
->
hostname
)
cache_add_dhcp_entry
(
lease
->
hostname
,
prot
,
(
struct
all_addr
*
)
&
lease
->
addr
,
lease
->
expires
);
#endif
}
}
dns_dirty
=
0
;
dns_dirty
=
0
;
...
...
src/network.c
View file @
91543f48
...
@@ -243,7 +243,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
...
@@ -243,7 +243,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
int
tftp_ok
=
!!
option_bool
(
OPT_TFTP
);
int
tftp_ok
=
!!
option_bool
(
OPT_TFTP
);
int
dhcp_ok
=
1
;
int
dhcp_ok
=
1
;
int
auth_dns
=
0
;
int
auth_dns
=
0
;
#if
def HAVE_DHCP
#if
defined(HAVE_DHCP) || defined(HAVE_TFTP)
struct
iname
*
tmp
;
struct
iname
*
tmp
;
#endif
#endif
...
@@ -362,6 +362,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
...
@@ -362,6 +362,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
#endif
#endif
#ifdef HAVE_TFTP
if
(
daemon
->
tftp_interfaces
)
if
(
daemon
->
tftp_interfaces
)
{
{
/* dedicated tftp interface list */
/* dedicated tftp interface list */
...
@@ -370,6 +371,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
...
@@ -370,6 +371,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
if
(
tmp
->
name
&&
wildcard_match
(
tmp
->
name
,
ifr
.
ifr_name
))
if
(
tmp
->
name
&&
wildcard_match
(
tmp
->
name
,
ifr
.
ifr_name
))
tftp_ok
=
1
;
tftp_ok
=
1
;
}
}
#endif
/* add to list */
/* add to list */
if
((
iface
=
whine_malloc
(
sizeof
(
struct
irec
))))
if
((
iface
=
whine_malloc
(
sizeof
(
struct
irec
))))
...
...
src/tftp.c
View file @
91543f48
...
@@ -49,9 +49,7 @@ void tftp_request(struct listener *listen, time_t now)
...
@@ -49,9 +49,7 @@ void tftp_request(struct listener *listen, time_t now)
struct
iovec
iov
;
struct
iovec
iov
;
struct
ifreq
ifr
;
struct
ifreq
ifr
;
int
is_err
=
1
,
if_index
=
0
,
mtu
=
0
;
int
is_err
=
1
,
if_index
=
0
,
mtu
=
0
;
#ifdef HAVE_DHCP
struct
iname
*
tmp
;
struct
iname
*
tmp
;
#endif
struct
tftp_transfer
*
transfer
;
struct
tftp_transfer
*
transfer
;
int
port
=
daemon
->
start_tftp_port
;
/* may be zero to use ephemeral port */
int
port
=
daemon
->
start_tftp_port
;
/* may be zero to use ephemeral port */
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
...
...
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