Document current behaviour of 'ignore' directive and 'append',

'prepend', 'default' and 'supersede' directives with respect to
'ignore'.

Document 'filename', 'fixed-address', 'next-server' and 'server-name'
directives.

1 files changed, 42 insertions, 2 deletions

diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index d44684abfaf..feddf48971a 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhclient.conf.5,v 1.43 2018/03/31 12:39:58 krw Exp $
+.\"	$OpenBSD: dhclient.conf.5,v 1.44 2018/05/12 12:50:17 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: March 31 2018 $
+.Dd $Mdocdate: May 12 2018 $
 .Dt DHCLIENT.CONF 5
 .Os
 .Sh NAME
@@ -106,6 +106,7 @@ for
 overrides any previous
 .Ic append ,
 .Ic default ,
+.Ic ignore ,
 .Ic prepend
 or
 .Ic supersede
@@ -123,6 +124,7 @@ for
 overrides any previous
 .Ic append ,
 .Ic default ,
+.Ic ignore ,
 .Ic prepend
 or
 .Ic supersede
@@ -133,6 +135,18 @@ Discard values provided for the listed options.
 .Ic ignore
 statements are cumulative, except that an empty
 list will remove all previously specified options.
+Each
+.Ic ignore
+for
+.Ar option
+overrides any previous
+.Ic append ,
+.Ic default ,
+.Ic prepend
+or
+.Ic supersede
+for
+.Ar option .
 .It Ic prepend Ar option option-value ;
 Prepend
 .Ar option-value
@@ -146,6 +160,7 @@ for
 overrides any previous
 .Ic append ,
 .Ic default ,
+.Ic ignore ,
 .Ic prepend
 or
 .Ic supersede
@@ -195,6 +210,7 @@ for
 overrides any previous
 .Ic append ,
 .Ic default ,
+.Ic ignore ,
 .Ic prepend
 or
 .Ic supersede
@@ -203,6 +219,18 @@ for
 .El
 .Sh OTHER DECLARATIONS
 .Bl -tag -width Ds
+.It Ic filename Ar path ;
+Use
+.Ar path
+instead of the
+.Ic file
+field of the DHCP offer when binding a lease.
+.It Ic fixed-address Ar ip-address ;
+Use
+.Ar ip-address
+instead of the
+.Ic yiaddr
+field of the DHCP offer when binding a lease.
 .It Ic interface Qo Ar name Qc No { Ar declaration ; ... ; No }
 Apply any
 .Ar declaration
@@ -213,6 +241,18 @@ If more than one
 .Ic reject
 is present all leases from any of the
 addresses will be discarded.
+.It Ic next-server Ar ip-address ;
+Use
+.Ar ip-address
+instead of the
+.Ic siaddr
+field of the DHCP offer when binding a lease.
+.It Ic server-name Ar host ;
+Use
+.Ar host
+instead of the
+.Ic sname
+field of the DHCP offer when binding a lease.
 .El
 .Sh SEE ALSO
 .Xr dhclient.leases 5 ,