From: Roy Marples <roy@marples.name>
Date: Thu, 12 Jul 2007 06:57:21 +0000 (+0000)
Subject: Pad after end
X-Git-Tag: v3.2.3~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f9fb4910121582739abf11b8102ea139885279f;p=thirdparty%2Fdhcpcd.git

Pad after end
---

diff --git a/dhcp.c b/dhcp.c
index 9f45d94b..d6dde73a 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -275,14 +275,15 @@ size_t send_message (const interface_t *iface, const dhcp_t *dhcp,
 		p += iface->hwlen;
 	}
 
+	*p++ = DHCP_END;
+
 #ifdef BOOTP_MESSAGE_LENTH_MIN
 	/* Some crappy DHCP servers think they have to obey the BOOTP minimum
 	 * messag length. They are wrong, but we should still cater for them */
-	while (p - m < BOOTP_MESSAGE_LENTH_MIN - 1)
+	while (p - m < BOOTP_MESSAGE_LENTH_MIN)
 		*p++ = DHCP_PAD;
 #endif
 
-	*p++ = DHCP_END;
 	message_length = p - m;
 
 	memset (&packet, 0, sizeof (struct udp_dhcp_packet));