dhclient - Remove wrong processing of option 33 (static routes).

- 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.

Taken-from: OpenBSD

diff --git a/sbin/dhclient/dhclient-script b/sbin/dhclient/dhclient-script
index 4f175c6..433deee 100644 (file)
--- a/sbin/dhclient/dhclient-script
+++ b/sbin/dhclient/dhclient-script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: src/sbin/dhclient/dhclient-script,v 1.20 2011/04/04 11:29:51 krw Exp $
+# $OpenBSD: src/sbin/dhclient/dhclient-script,v 1.22 2011/04/09 19:53:00 krw Exp $
 #
 # Copyright (c) 2003 Kenneth R Westerback <krw@openbsd.org>
 #
@@ -40,14 +40,6 @@ add_new_address() {
 }
 
 delete_old_routes() {
-       if [ -n "$old_static_routes" ]; then
-               set $old_static_routes
-               while [ $# -gt 1 ]; do
-                       route delete "$1" "$2"
-                       shift; shift
-               done
-       fi
-
        arp -dan
 }
 
@@ -63,14 +55,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 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 fe244a0..7487221 100644 (file)
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: src/sbin/dhclient/dhclient.conf.5,v 1.20 2011/04/04 11:14:52 krw Exp $
+.\" $OpenBSD: src/sbin/dhclient/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 August 3, 2012
+.Dd August 4, 2012
 .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), 15 (domain-name).
 Use of option modifiers on other options will have no effect unless
 .Xr dhclient-script 8
 the client configuration script is modified.