summaryrefslogtreecommitdiffstats
path: root/usr.sbin/dhcpd
diff options
context:
space:
mode:
authormatthieu <matthieu@openbsd.org>2018-02-28 19:49:33 +0000
committermatthieu <matthieu@openbsd.org>2018-02-28 19:49:33 +0000
commit136af74257ee6e92e2c765f2ff2104eb7d79aba5 (patch)
tree5eba10b6885ca07754b7b84789264a5f730de342 /usr.sbin/dhcpd
parentRevert the change that postpones CPUs until after mounthook activities. (diff)
downloadwireguard-openbsd-136af74257ee6e92e2c765f2ff2104eb7d79aba5.tar.xz
wireguard-openbsd-136af74257ee6e92e2c765f2ff2104eb7d79aba5.zip
Better documentation of the classless-static-routes option.
ok krw@, tweaks by jmc@
Diffstat (limited to 'usr.sbin/dhcpd')
-rw-r--r--usr.sbin/dhcpd/dhcp-options.512
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.sbin/dhcpd/dhcp-options.5 b/usr.sbin/dhcpd/dhcp-options.5
index 186a7f54780..4e6b5652ad8 100644
--- a/usr.sbin/dhcpd/dhcp-options.5
+++ b/usr.sbin/dhcpd/dhcp-options.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dhcp-options.5,v 1.22 2015/09/14 20:06:59 schwarze Exp $
+.\" $OpenBSD: dhcp-options.5,v 1.23 2018/02/28 19:49:33 matthieu Exp $
.\"
.\" Copyright (c) 1995, 1996, 1997, 1998 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: September 14 2015 $
+.Dd $Mdocdate: February 28 2018 $
.Dt DHCP-OPTIONS 5
.Os
.Sh NAME
@@ -171,6 +171,11 @@ RFC 1122.
.It Ic option classless-static-routes Ar ip/prefix ip Oo , Ar ip/prefix ip ... Oc ;
This option specifies a list of static routes in CDIR notation, which
should be sent to the client.
+This option is specified in RFC 3442.
+Note that, since the RFC says that clients supporting this option must ignore the
+.Ic Routers
+option when both are present, the default route
+needs to be included in the list of routes specified here.
.It Ic option classless-ms-static-routes Ar ip/prefix ip Oo , Ar ip/prefix ip ... Oc ;
This option does the same as
.Ic classless-static-routes ,
@@ -517,6 +522,9 @@ The default route (0.0.0.0) is an illegal destination for a static route.
To specify the default route, use the
.Ic routers
option.
+Note that this option is obsolete and should be replaced by the
+.Ic classless-static-routes
+option.
.It Ic option streettalk-directory-assistance-server Ar ip-address Oo , Ar ip-address ... Oc ;
The StreetTalk Directory Assistance (STDA) server option specifies a
list of STDA servers available to the client.