diff options
| author | Thomas Markwalder <tmark@isc.org> | 2020-07-30 10:01:36 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2020-10-07 10:41:45 +0000 |
| commit | 6c7e61578b1b449272dbb40dd8b98d03dad8a57a (patch) | |
| tree | afe6dd3922c199a1a419c1fb5634a76745c961c1 /server | |
| parent | 812cd4a7f8032047a3daa18e4f505efb146c687e (diff) | |
| download | isc-dhcp-6c7e61578b1b449272dbb40dd8b98d03dad8a57a.tar.gz | |
[#117] Fixed gcc 10 compilation issues147-keama-doesn-t-build-on-free-bsd-12-1117-isc-dhcp-does-not-build-with-gcc10
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
Diffstat (limited to 'server')
| -rw-r--r-- | server/mdb.c | 2 | ||||
| -rw-r--r-- | server/mdb6.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/mdb.c b/server/mdb.c index ff8a707f..8266d764 100644 --- a/server/mdb.c +++ b/server/mdb.c @@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL; 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) struct class *cd; diff --git a/server/mdb6.c b/server/mdb6.c index da7baf6e..ebe01e56 100644 --- a/server/mdb6.c +++ b/server/mdb6.c @@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt **pref, } new_ds.data = new_ds.buffer->data; 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_copy(&ds, &new_ds, MDL); data_string_forget(&new_ds, MDL); |