From: Roy Marples <roy@marples.name>
Date: Thu, 28 Jun 2007 03:41:25 +0000 (+0000)
Subject: Fix Client ID's
X-Git-Tag: v3.2.3~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eceac743738f5d2655c9b73d0bf62dab27b5c50;p=thirdparty%2Fdhcpcd.git

Fix Client ID's
---

diff --git a/dhcp.c b/dhcp.c
index 1f16702f..9f45d94b 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -248,7 +248,7 @@ size_t send_message (const interface_t *iface, const dhcp_t *dhcp,
 	if (options->clientid_len > 0) {
 		*p++ = options->clientid_len + 1;
 		*p++ = 0; /* string */
-		memcpy (p, options, options->clientid_len);
+		memcpy (p, options->clientid, options->clientid_len);
 		p += options->clientid_len;
 #ifdef ENABLE_DUID
 	} else if (iface->duid && options->clientid_len != -1) {
@@ -271,7 +271,7 @@ size_t send_message (const interface_t *iface, const dhcp_t *dhcp,
 	} else {
 		*p++ = iface->hwlen + 1;
 		*p++ = iface->family;
-		memcpy (p, &iface->hwaddr, iface->hwlen);
+		memcpy (p, iface->hwaddr, iface->hwlen);
 		p += iface->hwlen;
 	}