From 4c9ce022e4d5ac1c10a25995e00fb993ac3520a1 Mon Sep 17 00:00:00 2001
From: Antonio Huete Jimenez <tuxillo@quantumachine.net>
Date: Tue, 31 Jul 2012 21:53:05 +0200
Subject: [PATCH] dhclient - Clarify discussion of option modifiers.

They only affect values passed to dhclient-script. Our default script
only uses a few options so others are unaffected by option modifiers.

Taken-from: OpenBSD
---
 sbin/dhclient/dhclient.conf.5 |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index 41ad909..a157372 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -1,5 +1,4 @@
-.\"	$OpenBSD: dhclient.conf.5,v 1.14 2007/10/16 05:03:23 jmc Exp $
-.\"	$DragonFly: src/sbin/dhclient/dhclient.conf.5,v 1.3 2008/09/01 10:48:29 swildner Exp $
+.\" $OpenBSD: src/sbin/dhclient/dhclient.conf.5,v 1.15 2008/10/05 13:21:08 krw Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -37,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd August 30, 2008
+.Dd July 31, 2012
 .Dt DHCLIENT.CONF 5
 .Os
 .Sh NAME
@@ -213,12 +212,20 @@ that will allow it to differentiate between this client and other
 clients or kinds of clients.
 .El
 .Sh OPTION MODIFIERS
-In some cases, a client may receive option data from the server which
-is not really appropriate for that client, or may not receive
-information that it needs, and for which a useful default value exists.
-It may also receive information which is useful, but which needs to be
-supplemented with local information.
-To handle these needs, several option modifiers are available.
+Options in the lease can be modified before being passed to the client
+configuration script,
+.Xr dhclient-script 5 .
+.Pp
+The default
+.Xr dhclient-script 5
+processes only options 1 (subnet
+mask), 3 (routers), 6 (domain name servers), 15 (domain-name), and 33
+(static routes).
+Use of option modifiers on other options will have no effect unless
+.Xr dhclient-script 5
+is modified,
+.Pp
+Several option modifiers are available.
 .Bl -tag -width Ds
 .It Xo
 .Ic default No { Op Ar option declaration
@@ -529,6 +536,7 @@ In many cases, it's sufficient to just create an empty
 file \- the defaults are usually fine.
 .Sh SEE ALSO
 .Xr dhclient.leases 5 ,
+.Xr dhclient-script 5 ,
 .Xr dhcp-options 5 ,
 .Xr dhcpd.conf 5 Pq Pa pkgsrc/net/isc-dhcpd4 ,
 .Xr dhclient 8 ,
-- 
1.7.7.2