fixed compilation warning

diff --git a/.gitignore b/.gitignore
index 59eb7dd99c89c4e0be3928041d6c979cbe1da528..60c6723813e990bd6b923daaaf6e92ff121ca809 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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

diff --git a/RELNOTES b/RELNOTES
index 85a4515ed6992329765e1ea2226d44cf0db42cc8..1dfff17884f4be2d25a1c6ec10ad7dba39fcc50c 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -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 a0ff656bb3c84d7cc08475837d73e694039e4ffb..d06efa552c1c2b68e99e01957245afa520508dba 100644 (file)
--- 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 7211e3bbbec937386c0f5335a626a35dca8fee72..72b2b1f98abdfb38c5e54a11d81a9555782eef50 100644 (file)
--- 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 6c2ceedd7b7f7238352f272a7a3d0cdee0c757d4..7b25d70d595fa457855349f2a88eb60426796399 100644 (file)
--- 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
  */