Fix problems with some Linksys DHCP servers (and probably others) by

not accidentally inserting two NULL characters after each option in
the DHCPREQUEST packet.

Thanks to Christian Jones for the problem report and tcpdump's, and to
Emmett Pate for finding a problematic Linksys model still in my local
stores.

ok deraadt@

1 files changed, 2 insertions, 2 deletions

diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index e31ed2289ce..eff67b1bfe3 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.24 2005/07/16 16:31:05 henning Exp $	*/
+/*	$OpenBSD: options.c,v 1.25 2005/08/22 20:30:52 krw Exp $	*/
 
 /* DHCP options parsing and reassembly. */
 
@@ -222,7 +222,7 @@ cons_options(unsigned char *buf, const int buflen, struct option_data *options)
 
 			length -= incr;
 			ix += incr;
-			bufix += 2 + incr;
+			bufix += incr;
 		}
 	}