OpenBSD CVS

CVS log for src/sbin/dhclient/dhclient.conf.5


[BACK] Up to [local] / src / sbin / dhclient

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.52 / (download) - annotate - [select for diffs], Thu Mar 31 17:27:19 2022 UTC (2 years, 2 months ago) by naddy
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, HEAD
Changes since 1.51: +6 -6 lines
Diff to previous 1.51 (colored)

man pages: add missing commas between subordinate and main clauses

jmc@ dislikes a comma before "then" in a conditional, so leave those
untouched.

ok jmc@

Revision 1.51 / (download) - annotate - [select for diffs], Fri Jul 17 22:21:18 2020 UTC (3 years, 10 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.50: +3 -3 lines
Diff to previous 1.50 (colored)

'seonds' -> 'seconds'.

From Larry Hynes via tech@.

Revision 1.50 / (download) - annotate - [select for diffs], Mon Feb 10 13:18:20 2020 UTC (4 years, 3 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.49: +7 -2 lines
Diff to previous 1.49 (colored)

briefly mention /etc/examples/ in the FILES section of all the
manual pages that document the corresponding configuration files;
OK jmc@, and general direction discussed with many

Revision 1.49 / (download) - annotate - [select for diffs], Tue Dec 17 14:21:54 2019 UTC (4 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.48: +3 -2 lines
Diff to previous 1.48 (colored)

Reject leases that do not provide a subnet mask for the address being
provided. Restores behaviour previously provided by the default
dhclient.conf.

Revision 1.48 / (download) - annotate - [select for diffs], Thu Mar 21 06:31:10 2019 UTC (5 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.47: +3 -3 lines
Diff to previous 1.47 (colored)

punctuation needs to be preceeded by a space, in Scots;

Revision 1.47 / (download) - annotate - [select for diffs], Thu Mar 21 01:02:53 2019 UTC (5 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.46: +4 -4 lines
Diff to previous 1.46 (colored)

Clarify verbiage. If we could just write it in Scots then
it would be so much easier.

Revision 1.46 / (download) - annotate - [select for diffs], Wed Mar 20 20:10:00 2019 UTC (5 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.45: +14 -2 lines
Diff to previous 1.45 (colored)

Do not accept dhclient.conf(5) "prepend" or "append" statements when
the option data cannot be prepended or appended to. Instead, treat
"prepend" as "supersede" and "append" as "default". This preserves the
safe aspects of current behaviour. Issue a parsing warning when
appropriate to encourage people to fix their configuration files.

Eliminate egregious repeated code by abstracting merge_option_data().

Revision 1.45 / (download) - annotate - [select for diffs], Sat Jan 26 22:55:10 2019 UTC (5 years, 4 months ago) by krw
Branch: MAIN
Changes since 1.44: +23 -2 lines
Diff to previous 1.44 (colored)

Add 'uselease' statement to allow the disabling of built-in or
previously specified 'append', 'default', 'ignore', 'prepend', or
'supersede' actions on the values provided in leases.

Revision 1.44 / (download) - annotate - [select for diffs], Sat May 12 12:50:17 2018 UTC (6 years ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.43: +42 -2 lines
Diff to previous 1.43 (colored)

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.

Revision 1.43 / (download) - annotate - [select for diffs], Sat Mar 31 12:39:58 2018 UTC (6 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.42: +7 -7 lines
Diff to previous 1.42 (colored)

Move 'require' declaration into 'DHCP Options' section
alongside 'request'.

Revision 1.42 / (download) - annotate - [select for diffs], Tue Feb 27 23:48:44 2018 UTC (6 years, 3 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)

Typo: 'tftp-server' -> 'tftp-server-name'.

Spotted by Pontus Lundkvis. Thanks!

Revision 1.41 / (download) - annotate - [select for diffs], Sat Feb 10 23:25:15 2018 UTC (6 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.40: +9 -9 lines
Diff to previous 1.40 (colored)

Fix 'ignore ;' so that it really does reset the ignore list.

Mkae 'ignore', 'request' and 'require' cumulative so all
options don't have to be jammed into one line.

Revision 1.40 / (download) - annotate - [select for diffs], Tue Feb 6 00:25:09 2018 UTC (6 years, 3 months ago) by krw
Branch: MAIN
Changes since 1.39: +3 -3 lines
Diff to previous 1.39 (colored)

Flip -q (be quiet) into -v (be noisy), making terseness the default
behaviour.

Always go daemon after link_timeout seconds and complete lease
negotiations in the background if necessary. No hanging around in the
foreground for the full 64 seconds waiting for a server to appear.

Log a more relevant message when a default route can't be obtained via
RTM_GET. i.e. "no default route" rather than "No such process".

-q -> -v ok mpi@

Revision 1.39 / (download) - annotate - [select for diffs], Wed Dec 13 18:45:08 2017 UTC (6 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.38: +1 -3 lines
Diff to previous 1.38 (colored)

Simplifiy parser by not worrying about nesting 'interface <if> {}'
statements. They are silly but harmless and work fine.

Revision 1.38 / (download) - annotate - [select for diffs], Thu Dec 7 21:47:22 2017 UTC (6 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.37: +3 -6 lines
Diff to previous 1.37 (colored)

adjust the "timeout" text, now that leases are no longer
specified in dhclient.conf;

ok krw

Revision 1.37 / (download) - annotate - [select for diffs], Thu Dec 7 19:03:15 2017 UTC (6 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.36: +3 -12 lines
Diff to previous 1.36 (colored)

Nuke support for defining last-gasp leases in dhclient.conf.

Revision 1.36 / (download) - annotate - [select for diffs], Fri Oct 20 13:04:50 2017 UTC (6 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.35: +159 -410 lines
Diff to previous 1.35 (colored)

Flense dhclient.conf.5 down to useful information. Move
description of "lease {}" format to dhlcient.leases.5.
Neither implement standards so coalesce STANDARDS sections
into dhclient.8. AUTHOR and HISTORY sections not normally
used for .conf man pages so drop them. Many tweaks.

Language/formatting suggestions, stamp of approved by jmc@.

Revision 1.35 / (download) - annotate - [select for diffs], Mon Jul 31 18:56:21 2017 UTC (6 years, 10 months ago) by anton
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.34: +5 -8 lines
Diff to previous 1.34 (colored)

Shorten description and remove details regarding the parser implementation.

ok jmc@ krw@

Revision 1.34 / (download) - annotate - [select for diffs], Thu Sep 1 20:06:52 2016 UTC (7 years, 9 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.33: +3 -3 lines
Diff to previous 1.33 (colored)

tweak previous;

Revision 1.33 / (download) - annotate - [select for diffs], Thu Sep 1 13:47:24 2016 UTC (7 years, 9 months ago) by krw
Branch: MAIN
Changes since 1.32: +28 -10 lines
Diff to previous 1.32 (colored)

Document new default timeouts/intervals.

Revision 1.32 / (download) - annotate - [select for diffs], Fri Jun 3 02:38:37 2016 UTC (8 years ago) by tedu
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.31: +3 -3 lines
Diff to previous 1.31 (colored)

update default value for reboot

Revision 1.31 / (download) - annotate - [select for diffs], Mon Nov 11 15:39:20 2013 UTC (10 years, 6 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7, OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.30: +8 -2 lines
Diff to previous 1.30 (colored)

RFC 2131 and friends state that when renewing a lease the client
will begin by using unicast communications with the server, and
fall back to using broadcast packets if unicast fails.

We were not failing back, but instead doggedly sticking with unicast
attempts until the lease expired.

Instead, try unicast requests for the reboot timeout interval and
then switch to using broadcast requests.

Problem reported by Marc Peters and Dennis den Brok via misc@.

ok dlg@ millert@

Revision 1.30 / (download) - annotate - [select for diffs], Tue Jul 16 09:45:28 2013 UTC (10 years, 10 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.29: +4 -4 lines
Diff to previous 1.29 (colored)

Add missing .Mt macros for AUTHORS email addresses.
From Jan Stary <hans at stare dot cz>.
ok jmc@

Revision 1.29 / (download) - annotate - [select for diffs], Sat Mar 2 07:11:19 2013 UTC (11 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.28: +26 -31 lines
Diff to previous 1.28 (colored)

rework some text that ken thought ambiguous; ok krw

Revision 1.28 / (download) - annotate - [select for diffs], Sun Feb 24 12:18:43 2013 UTC (11 years, 3 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3
Changes since 1.27: +5 -6 lines
Diff to previous 1.27 (colored)

Remove some anachronisms and use consistant form and markup for
"/var/db/dhclient.leases.<IFNAME>".

Tweak and ok jmc@

Revision 1.27 / (download) - annotate - [select for diffs], Sat Feb 9 16:44:37 2013 UTC (11 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.26: +33 -62 lines
Diff to previous 1.26 (colored)

get the format of the various options in this file right and, along
the way, cut back on some of the crazy macros that were mostly around
to appease groff;

whilst there, fix the warnings reported by Jan Stary back in january;

lots of help and ok krw

Revision 1.26 / (download) - annotate - [select for diffs], Tue Nov 27 15:51:48 2012 UTC (11 years, 6 months ago) by krw
Branch: MAIN
Changes since 1.25: +19 -2 lines
Diff to previous 1.25 (colored)

Clean up parsing of option lists. Part 6.

Treat 'ignore' option lists the same as 'request' and 'require'
option lists. i.e.  keep a list of the options rather than using
an ACTION flag. So overriding a previous ignore list will not leave
breadcrumbs and incorrect ACTIONs lying around.

The list will be applied when the new lease is created, and will
override any ACTION specified for the option.

Mention in dhclient.conf(5) that each request/require/ignore statement
will override any previous one.

Revision 1.25 / (download) - annotate - [select for diffs], Tue Oct 30 18:39:44 2012 UTC (11 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.24: +6 -30 lines
Diff to previous 1.24 (colored)

Nuke dhclient-script and dhclient.conf 'script' directive. Do all
interface and route configuration via ioctl's and routing sockets.

This will break configurations using local enhancements of
dhclient-script, which will now require alternate arrangements.

Committing early to allow time to identify and develop required
alternatives.

Several proddings by deraadt@.

Revision 1.24 / (download) - annotate - [select for diffs], Sat Oct 27 23:08:53 2012 UTC (11 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.23: +12 -10 lines
Diff to previous 1.23 (colored)

Change dhclient.conf directive 'ignore' to take a list of option names
rather than list of option declarations. e.g. 'ignore routers;'
instead of 'ignore routers 1.2.3.4;' The value in the declaration
was being ignored anyway.

While there clean up the related code a bit.

Revision 1.23 / (download) - annotate - [select for diffs], Sat Sep 22 20:09:43 2012 UTC (11 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.22: +17 -4 lines
Diff to previous 1.22 (colored)

last stage of rfc changes, using consistent Rs/Re blocks, and moving the
references into a STANDARDS section;

Revision 1.22 / (download) - annotate - [select for diffs], Wed Aug 22 00:14:42 2012 UTC (11 years, 9 months ago) by tedu
Branch: MAIN
Changes since 1.21: +10 -2 lines
Diff to previous 1.21 (colored)

add ignore keyword to conf file, allowing one to ignore unwanted info
from the server without necessarily speciyfing a supersede value

Revision 1.21 / (download) - annotate - [select for diffs], Sat Apr 9 19:53:00 2011 UTC (13 years, 1 month ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.20: +3 -4 lines
Diff to previous 1.20 (colored)

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.

Revision 1.20 / (download) - annotate - [select for diffs], Mon Apr 4 11:14:52 2011 UTC (13 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.19: +4 -73 lines
Diff to previous 1.19 (colored)

Dump some useless calls to dhclient-script. i.e. MEDIUM, PREINIT,
ARPSEND, ARPCHECK. Drop support for 'media', 'medium' and 'alias'
specifications in dhclient.conf. Old leases still parse but these
options now have no effect.

Be more polite and decline all offers we don't accept. Fix a IMSG
length check.

Many expressions of support at various bars.

ok henning@ deraadt@ beck@

Revision 1.19 / (download) - annotate - [select for diffs], Sun Mar 27 06:50:48 2011 UTC (13 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.18: +4 -3 lines
Diff to previous 1.18 (colored)

new sentence, new line;

Revision 1.18 / (download) - annotate - [select for diffs], Sat Mar 26 23:17:50 2011 UTC (13 years, 2 months ago) by krw
Branch: MAIN
Changes since 1.17: +5 -5 lines
Diff to previous 1.17 (colored)

Correct described default for initial-interval. It is three, not
ten, seconds.  Use words not numerals consistently when naming
various timing values. Tweak one clumsy sentence.

Revision 1.17 / (download) - annotate - [select for diffs], Sun Oct 5 20:36:00 2008 UTC (15 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.16: +7 -9 lines
Diff to previous 1.16 (colored)

- talk about the "client configuration script" consistenly
- Xr dhclient-script on first mention, which is section 8 not 5

ok krw

Revision 1.16 / (download) - annotate - [select for diffs], Sun Oct 5 13:24:40 2008 UTC (15 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 (colored)

Oops. Missed one typo jmc@ spotted.

Revision 1.15 / (download) - annotate - [select for diffs], Sun Oct 5 13:21:08 2008 UTC (15 years, 7 months ago) by krw
Branch: MAIN
Changes since 1.14: +17 -8 lines
Diff to previous 1.14 (colored)

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. PR#5834 is thus rendered
moot.

Feedback & suggestions from jmc@, ok deraadt@.

Revision 1.14 / (download) - annotate - [select for diffs], Tue Oct 16 05:03:23 2007 UTC (16 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.13: +14 -14 lines
Diff to previous 1.13 (colored)

"script" does not belong in the lease declaration section;
from Vincent GROSS

ok henning

Revision 1.13 / (download) - annotate - [select for diffs], Thu May 31 19:19:43 2007 UTC (17 years ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

convert to new .Dd format;

Revision 1.12 / (download) - annotate - [select for diffs], Mon Dec 18 19:11:44 2006 UTC (17 years, 5 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.11: +3 -5 lines
Diff to previous 1.11 (colored)

remove statement for send parameter: "except that the client can
specify a dhcp-lease-time option other than the default requested
lease time, which is two hours".

we don't by default send a dhcp-lease-time option in request/discover.

ok jmc@, henning@ 'if you are sure'

Revision 1.11 / (download) - annotate - [select for diffs], Fri Jun 2 15:19:24 2006 UTC (18 years ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.10: +2 -2 lines
Diff to previous 1.10 (colored)

backoff-cutoff defaults to 15 seconds; ok henning@

Revision 1.10 / (download) - annotate - [select for diffs], Wed May 31 12:04:24 2006 UTC (18 years ago) by stevesk
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

clarify link-timeout default as seconds; ok jmc@

Revision 1.9 / (download) - annotate - [select for diffs], Tue May 9 13:14:16 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.8: +3 -2 lines
Diff to previous 1.8 (colored)

new sentence, new line;

Revision 1.8 / (download) - annotate - [select for diffs], Tue May 9 06:00:27 2006 UTC (18 years ago) by deraadt
Branch: MAIN
Changes since 1.7: +4 -4 lines
Diff to previous 1.7 (colored)

spelling

Revision 1.7 / (download) - annotate - [select for diffs], Mon May 8 17:25:59 2006 UTC (18 years ago) by deraadt
Branch: MAIN
Changes since 1.6: +7 -1 lines
Diff to previous 1.6 (colored)

add 'link-timeout n' seconds option to grammer, from fkr@hazardous.org
default remains 10 seconds.

Revision 1.6 / (download) - annotate - [select for diffs], Fri Sep 30 20:34:23 2005 UTC (18 years, 8 months ago) by jaredy
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.5: +2 -1 lines
Diff to previous 1.5 (colored)

deploy .An -nosplit; ok jmc

Revision 1.5 / (download) - annotate - [select for diffs], Mon Nov 1 23:10:18 2004 UTC (19 years, 7 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE, OPENBSD_3_8, OPENBSD_3_7_BASE, OPENBSD_3_7
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)

much to my surprise a minute has only 60 seconds, and the hour 60 minutes,
not 70 :(
From: Jorden Verwer <J.Verwer@inter.NL.net>

Revision 1.4 / (download) - annotate - [select for diffs], Thu Apr 15 08:59:47 2004 UTC (20 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.3: +4 -1 lines
Diff to previous 1.3 (colored)

more AUTHORS update;
ok henning@

Revision 1.3 / (download) - annotate - [select for diffs], Fri Apr 9 18:30:15 2004 UTC (20 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.2: +1 -4 lines
Diff to previous 1.2 (colored)

remove some excess from AUTHORS, and slight update;

requested by henning, and discussed w/ him and deraadt;
ok henning@

Revision 1.2 / (download) - annotate - [select for diffs], Sun Apr 4 15:12:02 2004 UTC (20 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.1: +2 -9 lines
Diff to previous 1.1 (colored)

Emil Mikulic pointed out there are two copies of this stuff (thanks!) ...

- correct option is `dhcp-lease-time', not `requested-lease-time'; fixed
w/ help from krw@
- kill a rake of unnecessary .Pp's

Revision 1.1 / (download) - annotate - [select for diffs], Sun Jan 18 01:26:20 2004 UTC (20 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5

this is where dhclient will start surgery

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.