diff options
| author | Razvan Becheriu <razvan@isc.org> | 2022-01-13 20:08:49 +0200 |
|---|---|---|
| committer | Razvan Becheriu <razvan@isc.org> | 2022-01-19 20:59:15 +0200 |
| commit | 0c03eaefbbd3f0e22dd5df600c4b707af294890c (patch) | |
| tree | dedbb2a1972262c4872c4f9b02d787d4f60721af | |
| parent | f853b9c8e53bc31b95b8ced12e492ab94a7ef2ce (diff) | |
| download | isc-dhcp-0c03eaefbbd3f0e22dd5df600c4b707af294890c.tar.gz | |
fixed compilation warning190-dhclient-wrong-argument-to-memcpy
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | RELNOTES | 3 | ||||
| -rw-r--r-- | client/dhclient.c | 10 | ||||
| -rw-r--r-- | relay/dhcrelay.c | 4 | ||||
| -rw-r--r-- | server/dhcpd.c | 4 |
5 files changed, 14 insertions, 9 deletions
@@ -9,6 +9,7 @@ client/tests/duid_unittests client/tests/test-suite.log common/tests/alloc_unittest common/tests/dns_unittest +common/tests/domain_name_unittest common/tests/misc_unittest common/tests/ns_name_unittest common/tests/option_unittest @@ -24,6 +25,7 @@ libtool ltmain.sh omapip/svtest relay/dhcrelay +relay/tests/relay_unittests server/dhcpd server/tests/dhcpd_unittests server/tests/hash_unittests @@ -130,6 +130,9 @@ and the client Linux script sample was updated. convenient on all systems. [Gitlab #197] +- Minor dhclient code fix to remove compilation warnings. + [Gitlab #190] + Changes since 4.4.2b1 (Bug Fixes) - Added a clarification on DHCPINFORMs and server authority to diff --git a/client/dhclient.c b/client/dhclient.c index a0ff656b..d06efa55 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -137,10 +137,10 @@ static void dhclient_ddns_cb_free(dhcp_ddns_cb_t *ddns_cb, * the description of the command line. The arguments provide * a way for the caller to request more specific information about * the error be printed as well. Mostly this will be that some - * comamnd doesn't include its argument. + * command doesn't include its argument. * * \param sfmt - The basic string and format for the specific error - * \param sarg - Generally the offending argument from the comamnd line. + * \param sarg - Generally the offending argument from the command line. * * \return Nothing */ @@ -567,7 +567,7 @@ main(int argc, char **argv) { } else if (argv[i][0] == '-') { usage("Unknown command: %s", argv[i]); } else if (interfaces_requested < 0) { - usage("No interfaces comamnd -n and " + usage("No interfaces command -n and " " requested interface %s", argv[i]); } else { struct interface_info *tmp = NULL; @@ -3399,12 +3399,12 @@ make_client_options(struct client_state *client, struct client_lease *lease, hw_idx = 0; hw_len = client->interface->hw_address.hlen; } - memcpy(&client_identifier.buffer->data + 5 - hw_len, + memcpy(client_identifier.buffer->data + 5 - hw_len, client->interface->hw_address.hbuf + hw_idx, hw_len); /* Add the default duid */ - memcpy(&client_identifier.buffer->data+(1+4), + memcpy(client_identifier.buffer->data + (1 + 4), default_duid.data, default_duid.len); /* And save the option */ diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 7211e3bb..72b2b1f9 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -235,10 +235,10 @@ char *progname; * the description of the command line. The arguments provide * a way for the caller to request more specific information about * the error be printed as well. Mostly this will be that some - * comamnd doesn't include its argument. + * command doesn't include its argument. * * \param sfmt - The basic string and format for the specific error - * \param sarg - Generally the offending argument from the comamnd line. + * \param sarg - Generally the offending argument from the command line. * * \return Nothing */ diff --git a/server/dhcpd.c b/server/dhcpd.c index 6c2ceedd..7b25d70d 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -195,10 +195,10 @@ static void omapi_listener_start (void *foo) * the description of the command line. The arguments provide * a way for the caller to request more specific information about * the error be printed as well. Mostly this will be that some - * comamnd doesn't include its argument. + * command doesn't include its argument. * * \param sfmt - The basic string and format for the specific error - * \param sarg - Generally the offending argument from the comamnd line. + * \param sarg - Generally the offending argument from the command line. * * \return Nothing */ |