From: Roy Marples <roy@marples.name>
Date: Wed, 16 Jan 2008 17:38:02 +0000 (+0000)
Subject: Don't request a NULL address and supply a serveraddress when we should.
X-Git-Tag: v3.2.3~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c3c3a9d5f5d8695273404968d329abce816da49;p=thirdparty%2Fdhcpcd.git

Don't request a NULL address and supply a serveraddress when we should.
---

diff --git a/dhcp.c b/dhcp.c
index e26208b3..0c23a580 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -183,12 +183,15 @@ size_t send_message (const interface_t *iface, const dhcp_t *dhcp,
 			logger (LOG_ERR,
 				"cannot request a link local address");
 		else {
-			if (dhcp->address.s_addr != iface->previous_address.s_addr &&
+			if (dhcp->address.s_addr &&
+			    dhcp->address.s_addr !=
+			    iface->previous_address.s_addr &&
 			    type != DHCP_RELEASE)
 				PUTADDR (DHCP_ADDRESS, dhcp->address);
 
-			if (dhcp->serveraddress.s_addr != 0 && dhcp->address.s_addr !=0 &&
-			    (iface->previous_address.s_addr == 0 || type == DHCP_RELEASE))
+			if (dhcp->serveraddress.s_addr &&
+			    dhcp->address.s_addr &&
+			    (type == DHCP_REQUEST || type == DHCP_RELEASE))
 				PUTADDR (DHCP_SERVERIDENTIFIER,
 					 dhcp->serveraddress);
 		}