Merge from head@274682

2 files changed, 1 insertions, 11 deletions

diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index f79ca2f..859f48b 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -127,17 +127,6 @@ assemble_udp_ip_header(unsigned char *buf, int *bufix, u_int32_t from,
 	ip.ip_dst.s_addr = to;
 
 	ip.ip_sum = wrapsum(checksum((unsigned char *)&ip, sizeof(ip), 0));
-
-	/*
-	 * While the BPF -- used for broadcasts -- expects a "true" IP header
-	 * with all the bytes in network byte order, the raw socket interface
-	 * which is used for unicasts expects the ip_len field to be in host
-	 * byte order.  In both cases, the checksum has to be correct, so this
-	 * is as good a place as any to turn the bytes around again.
-	 */
-	if (to != INADDR_BROADCAST)
-		ip.ip_len = ntohs(ip.ip_len);
-
 	memcpy(&buf[*bufix], &ip, sizeof(ip));
 	*bufix += sizeof(ip);
 
diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile
index b092eea..a460f7f 100644
--- a/sbin/dhclient/tests/Makefile
+++ b/sbin/dhclient/tests/Makefile
@@ -8,6 +8,7 @@ PLAIN_TESTS_C=				option-domain-search_test
 SRCS.option-domain-search_test=		alloc.c convert.c hash.c options.c \
 					tables.c fake.c option-domain-search.c
 CFLAGS.option-domain-search_test+=	-I${.CURDIR}/..
+DPADD.option-domain-search_test=	${LIBUTIL}
 LDADD.option-domain-search_test=	-lutil
 
 WARNS?=	2