2
0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-25 11:27:31 +00:00

fixed compilation warning

This commit is contained in:
Razvan Becheriu 2022-01-13 20:08:49 +02:00
parent f853b9c8e5
commit 0c03eaefbb
5 changed files with 14 additions and 9 deletions

2
.gitignore vendored
View File

@ -9,6 +9,7 @@ client/tests/duid_unittests
client/tests/test-suite.log client/tests/test-suite.log
common/tests/alloc_unittest common/tests/alloc_unittest
common/tests/dns_unittest common/tests/dns_unittest
common/tests/domain_name_unittest
common/tests/misc_unittest common/tests/misc_unittest
common/tests/ns_name_unittest common/tests/ns_name_unittest
common/tests/option_unittest common/tests/option_unittest
@ -24,6 +25,7 @@ libtool
ltmain.sh ltmain.sh
omapip/svtest omapip/svtest
relay/dhcrelay relay/dhcrelay
relay/tests/relay_unittests
server/dhcpd server/dhcpd
server/tests/dhcpd_unittests server/tests/dhcpd_unittests
server/tests/hash_unittests server/tests/hash_unittests

View File

@ -130,6 +130,9 @@ and the client Linux script sample was updated.
convenient on all systems. convenient on all systems.
[Gitlab #197] [Gitlab #197]
- Minor dhclient code fix to remove compilation warnings.
[Gitlab #190]
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

View File

@ -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 * the description of the command line. The arguments provide
* a way for the caller to request more specific information about * a way for the caller to request more specific information about
* the error be printed as well. Mostly this will be that some * 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 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 * \return Nothing
*/ */
@ -567,7 +567,7 @@ main(int argc, char **argv) {
} else if (argv[i][0] == '-') { } else if (argv[i][0] == '-') {
usage("Unknown command: %s", argv[i]); usage("Unknown command: %s", argv[i]);
} else if (interfaces_requested < 0) { } else if (interfaces_requested < 0) {
usage("No interfaces comamnd -n and " usage("No interfaces command -n and "
" requested interface %s", argv[i]); " requested interface %s", argv[i]);
} else { } else {
struct interface_info *tmp = NULL; struct interface_info *tmp = NULL;
@ -3399,12 +3399,12 @@ make_client_options(struct client_state *client, struct client_lease *lease,
hw_idx = 0; hw_idx = 0;
hw_len = client->interface->hw_address.hlen; 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, client->interface->hw_address.hbuf + hw_idx,
hw_len); hw_len);
/* Add the default duid */ /* Add the default duid */
memcpy(&client_identifier.buffer->data+(1+4), memcpy(client_identifier.buffer->data + (1 + 4),
default_duid.data, default_duid.len); default_duid.data, default_duid.len);
/* And save the option */ /* And save the option */

View File

@ -235,10 +235,10 @@ char *progname;
* the description of the command line. The arguments provide * the description of the command line. The arguments provide
* a way for the caller to request more specific information about * a way for the caller to request more specific information about
* the error be printed as well. Mostly this will be that some * 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 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 * \return Nothing
*/ */

View File

@ -195,10 +195,10 @@ static void omapi_listener_start (void *foo)
* the description of the command line. The arguments provide * the description of the command line. The arguments provide
* a way for the caller to request more specific information about * a way for the caller to request more specific information about
* the error be printed as well. Mostly this will be that some * 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 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 * \return Nothing
*/ */