We are incorrectly processing option 33 (static route), treating

is as a host route rather than a classful network route. Too
much trouble to fix such an obsolete feature, so ignore option
33 info.

2 files changed, 4 insertions, 22 deletions

diff --git a/sbin/dhclient/dhclient-script b/sbin/dhclient/dhclient-script
index 45f8f0092f6..05d4638f68e 100644
--- a/sbin/dhclient/dhclient-script
+++ b/sbin/dhclient/dhclient-script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: dhclient-script,v 1.21 2011/04/04 12:22:41 krw Exp $
+# $OpenBSD: dhclient-script,v 1.22 2011/04/09 19:53:00 krw Exp $
 #
 # Copyright (c) 2003 Kenneth R Westerback <krw@openbsd.org>
 #
@@ -54,15 +54,6 @@ delete_old_routes() {
 	# Delete existing default route. We only allow one, so no need to
 	# process $old_routers list.
 	route -q $rdomain -n flush -inet -iface $interface
-
-	if [ -n "$old_static_routes" ]; then
-		set $old_static_routes
-		while [ $# -gt 1 ]; do
-			route -q $rdomain delete "$1" "$2"
-			shift; shift
-		done
-	fi
-
 	arp -dan
 }
 
@@ -78,14 +69,6 @@ add_new_routes() {
 		# stop processing the list after the first one.
 		break
 	done
-
-	if [ -n "$new_static_routes" ]; then
-		set $new_static_routes
-		while [ $# -gt 1 ]; do
-			route -q $rdomain add $1 $2
-			shift; shift
-		done
-	fi
 }
 
 add_new_resolv_conf() {
diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index c4754c29e43..637720e5be5 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhclient.conf.5,v 1.20 2011/04/04 11:14:52 krw Exp $
+.\"	$OpenBSD: dhclient.conf.5,v 1.21 2011/04/09 19:53:00 krw Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: April 4 2011 $
+.Dd $Mdocdate: April 9 2011 $
 .Dt DHCLIENT.CONF 5
 .Os
 .Sh NAME
@@ -219,8 +219,7 @@ configuration script,
 .Pp
 The default client configuration script
 processes only options 1 (subnet
-mask), 3 (routers), 6 (domain name servers), 15 (domain-name), and 33
-(static routes).
+mask), 3 (routers), 6 (domain name servers), and 15 (domain-name).
 Use of option modifiers on other options will have no effect unless
 the client configuration script is modified.
 .Pp