mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 18:07:25 +00:00
Code Issues Releases Wiki Activity

[#117] Fixed gcc 10 compilation issues

Browse Source 
client/dhclient.c
relay/dhcrelay.c
    extern'ed local_port,remote_port

common/discover.c
    init local_port,remote_port to 0

server/mdb.c
    extern'ed dhcp_type_host

server/mdb6.c
    create_prefix6() - eliminated memcpy string overflow error
This commit is contained in:
Thomas Markwalder 2020-07-30 10:01:36 -04:00
parent 812cd4a7f8
commit 6c7e61578b
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELNOTES
View File

@ -103,6 +103,11 @@ ISC DHCP is open source software maintained by Internet Systems
Consortium. This product includes cryptographic software written Consortium. This product includes cryptographic software written
by Eric Young (eay@cryptsoft.com). by Eric Young (eay@cryptsoft.com).
Changes since 4.4.2 (Bug Fixes)
- Minor corrections to allow compilation under gcc 10.
[Gitlab #117]
Changes since 4.4.2b1 (Bug Fixes) Changes since 4.4.2b1 (Bug Fixes)
- Added a clarification on DHCPINFORMs and server authority to - Added a clarification on DHCPINFORMs and server authority to

5
client/dhclient.c
View File

@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Consortium DHCP Client";
static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/"; static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
#endif /* UNIT_TEST */ #endif /* UNIT_TEST */
u_int16_t local_port = 0; extern u_int16_t local_port;
u_int16_t remote_port = 0; extern u_int16_t remote_port;
#if defined(DHCPv6) && defined(DHCP4o6) #if defined(DHCPv6) && defined(DHCP4o6)
int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */ int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
#endif #endif

4
common/discover.c
View File

@ -45,8 +45,8 @@ struct interface_info *fallback_interface = 0;
int interfaces_invalidated; int interfaces_invalidated;
int quiet_interface_discovery; int quiet_interface_discovery;
u_int16_t local_port; u_int16_t local_port = 0;
u_int16_t remote_port; u_int16_t remote_port = 0;
u_int16_t relay_port = 0; u_int16_t relay_port = 0;
int dhcpv4_over_dhcpv6 = 0; int dhcpv4_over_dhcpv6 = 0;
int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *); int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *);

4
relay/dhcrelay.c
View File

@ -95,8 +95,8 @@ enum { forward_and_append, /* Forward and append our own relay option. */
forward_untouched, /* Forward without changes. */ forward_untouched, /* Forward without changes. */
discard } agent_relay_mode = forward_and_replace; discard } agent_relay_mode = forward_and_replace;
u_int16_t local_port; extern u_int16_t local_port;
u_int16_t remote_port; extern u_int16_t remote_port;
/* Relay agent server list. */ /* Relay agent server list. */
struct server_list { struct server_list {

2
server/mdb.c
View File

@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL;
int numclasseswritten; int numclasseswritten;
omapi_object_type_t *dhcp_type_host; extern omapi_object_type_t *dhcp_type_host;
isc_result_t enter_class(cd, dynamicp, commit) isc_result_t enter_class(cd, dynamicp, commit)
struct class *cd; struct class *cd;

2
server/mdb6.c
View File

@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt **pref,
} }
new_ds.data = new_ds.buffer->data; new_ds.data = new_ds.buffer->data;
memcpy(new_ds.buffer->data, ds.data, ds.len); memcpy(new_ds.buffer->data, ds.data, ds.len);
memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp)); memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp));
data_string_forget(&ds, MDL); data_string_forget(&ds, MDL);
data_string_copy(&ds, &new_ds, MDL); data_string_copy(&ds, &new_ds, MDL);
data_string_forget(&new_ds, MDL); data_string_forget(&new_ds, MDL);