From: Antonio Huete Jimenez <tuxillo@quantumachine.net>
Date: Wed, 1 Aug 2012 19:12:15 +0000 (+0200)
Subject: dhclient - Make room for trailing \0 on prepend/append for dhcp options.
X-Git-Tag: v3.2.0~345
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/c1b95e6252a9d154c7a47210287b5d6c63a7fe68

dhclient - Make room for trailing \0 on prepend/append for dhcp options.

Taken-from: OpenBSD
---

diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 211981f..c396a8a 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: src/sbin/dhclient/dhclient.c,v 1.131 2009/07/19 00:18:02 stevesk Exp $	*/
+/*	$OpenBSD: src/sbin/dhclient/dhclient.c,v 1.132 2009/11/12 14:18:45 jsg Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -1660,7 +1660,7 @@ supersede:
 				case ACTION_PREPEND:
 					len = config->defaults[i].len +
 					    lease->options[i].len;
-					if (len > sizeof(dbuf)) {
+					if (len >= sizeof(dbuf)) {
 						warning("no space to %s %s",
 						    "prepend option",
 						    dhcp_options[i].name);
@@ -1679,7 +1679,7 @@ supersede:
 				case ACTION_APPEND:
 					len = config->defaults[i].len +
 					    lease->options[i].len;
-					if (len > sizeof(dbuf)) {
+					if (len >= sizeof(dbuf)) {
 						warning("no space to %s %s",
 						    "append option",
 						    dhcp_options[i].name);