gistfile1.txt

Subject: [PATCH] RAX - Disable dhcp_client_id in order to prevent duplicate
 dhcp lease assignment

---
 src/net/udp/dhcp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index e6d3edd..9f85ffd 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -972,11 +972,11 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt,
 			  uint32_t xid, struct in_addr ciaddr,
 			  void *data, size_t max_len ) {
 	struct dhcp_netdev_desc dhcp_desc;
-	struct dhcp_client_id client_id;
+//	struct dhcp_client_id client_id;
 	struct dhcp_client_uuid client_uuid;
 	uint8_t *dhcp_features;
 	size_t dhcp_features_len;
-	size_t ll_addr_len;
+//	size_t ll_addr_len;
 	void *user_class;
 	ssize_t len;
 	int rc;
@@ -1017,7 +1017,7 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt,
 	/* Add DHCP client identifier.  Required for Infiniband, and
 	 * doesn't hurt other link layers.
 	 */
-	client_id.ll_proto = ntohs ( netdev->ll_protocol->ll_proto );
+/*	client_id.ll_proto = ntohs ( netdev->ll_protocol->ll_proto );
 	ll_addr_len = netdev->ll_protocol->ll_addr_len;
 	assert ( ll_addr_len <= sizeof ( client_id.ll_addr ) );
 	memcpy ( client_id.ll_addr, netdev->ll_addr, ll_addr_len );
@@ -1026,7 +1026,7 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt,
 		DBG ( "DHCP could not set client ID: %s\n",
 		      strerror ( rc ) );
 		goto err_store_client_id;
-	}
+	}*/
 
 	/* Add client UUID, if we have one.  Required for PXE.  The
 	 * PXE spec does not specify a byte ordering for UUIDs, but
@@ -1060,7 +1060,7 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt,
  err_store_user_class:
 	free ( user_class );
  err_store_client_uuid:
- err_store_client_id:
+// err_store_client_id:
  err_store_busid:
  err_store_features:
  err_create_packet:
-- 
1.9.3