From: florian Date: Thu, 27 Jun 2024 16:39:31 +0000 (+0000) Subject: Remove outdated references to dhclient, it's finally going away. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a15cd29622c9321173e85e78eff2317df5c665fe;p=openbsd Remove outdated references to dhclient, it's finally going away. Input & OK jmc --- diff --git a/usr.sbin/dhcpd/dhcp-options.5 b/usr.sbin/dhcpd/dhcp-options.5 index e8c4ff13841..63d42ea9a62 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.34 2023/11/23 16:30:12 florian Exp $ +.\" $OpenBSD: dhcp-options.5,v 1.35 2024/06/27 16:39:31 florian 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: November 23 2023 $ +.Dd $Mdocdate: June 27 2024 $ .Dt DHCP-OPTIONS 5 .Os .Sh NAME @@ -48,9 +48,7 @@ The Dynamic Host Configuration protocol allows the client to receive from the DHCP server describing the network configuration and various services that are available on the network. When configuring -.Xr dhcpd 8 -or -.Xr dhclient 8 , +.Xr dhcpd 8 , options must often be declared. The syntax for declaring options, and the names and formats of the options that can be declared, are documented here. @@ -290,15 +288,6 @@ The .Ic domain-search option specifies a list of the domain names that should be used during DNS name resolution. -.Pp -When -.Xr dhclient 8 -constructs -.Xr resolv.conf 5 , -it will use this list of domains in preference to any information -provided by the -.Ic domain-name -option. .It Ic option extensions-path Ar string ; A string to specify a file, retrievable via TFTP, which contains information which can be interpreted in the same way as the 64-octet vendor-extension @@ -554,8 +543,6 @@ option. Note that this option is obsolete and should be replaced by the .Ic classless-static-routes option. -.Xr dhclient 8 -ignores this 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. @@ -655,11 +642,11 @@ System Display Manager and are available to the client. Addresses should be listed in order of preference. .El .Sh SEE ALSO -.Xr dhclient.conf 5 , .Xr dhcpd.conf 5 , .Xr dhcpd.leases 5 , -.Xr dhclient 8 , -.Xr dhcpd 8 +.Xr dhcpleased.conf 5 , +.Xr dhcpd 8, +.Xr dhcpleased 8 .Sh STANDARDS .Rs .%A R. Droms diff --git a/usr.sbin/dhcpd/dhcpd.8 b/usr.sbin/dhcpd/dhcpd.8 index 5d9c29b7503..009f8dfce2e 100644 --- a/usr.sbin/dhcpd/dhcpd.8 +++ b/usr.sbin/dhcpd/dhcpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhcpd.8,v 1.35 2024/04/19 19:16:26 jmc Exp $ +.\" $OpenBSD: dhcpd.8,v 1.36 2024/06/27 16:39:31 florian Exp $ .\" .\" Copyright (c) 1995, 1996 The Internet Software Consortium. .\" All rights reserved. @@ -36,7 +36,7 @@ .\" see ``http://www.isc.org/''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. .\" -.Dd $Mdocdate: April 19 2024 $ +.Dd $Mdocdate: June 27 2024 $ .Dt DHCPD 8 .Os .Sh NAME @@ -474,7 +474,7 @@ DHCPD lease file. .Xr rdomain 4 , .Xr dhcpd.conf 5 , .Xr dhcpd.leases 5 , -.Xr dhclient 8 , +.Xr dhcpleased 8 , .Xr dhcrelay 8 , .Xr pxeboot 8 .Sh STANDARDS diff --git a/usr.sbin/dhcpd/dhcpd.leases.5 b/usr.sbin/dhcpd/dhcpd.leases.5 index 70801bb56f2..15ee8a3063c 100644 --- a/usr.sbin/dhcpd/dhcpd.leases.5 +++ b/usr.sbin/dhcpd/dhcpd.leases.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhcpd.leases.5,v 1.13 2015/07/27 18:48:04 sobrado Exp $ +.\" $OpenBSD: dhcpd.leases.5,v 1.14 2024/06/27 16:39:31 florian Exp $ .\" .\" Copyright (c) 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: July 27 2015 $ +.Dd $Mdocdate: June 27 2024 $ .Dt DHCPD.LEASES 5 .Os .Sh NAME @@ -52,12 +52,6 @@ recorded at the end of the lease file. So if more than one declaration appears for a given lease, the last one in the file is the current one. .Sh FORMAT -Lease descriptions are stored in a format that is parsed by the same -recursive descent parser used to read the -.Xr dhcpd.conf 5 -and -.Xr dhclient.conf 5 -files. Currently, the only declaration that is used in the .Nm file is the diff --git a/usr.sbin/dhcpd/parse.c b/usr.sbin/dhcpd/parse.c index 8f79ab38a56..3d9df51ba72 100644 --- a/usr.sbin/dhcpd/parse.c +++ b/usr.sbin/dhcpd/parse.c @@ -1,6 +1,4 @@ -/* $OpenBSD: parse.c,v 1.28 2022/01/16 21:20:25 naddy Exp $ */ - -/* Common parser code for dhcpd and dhclient. */ +/* $OpenBSD: parse.c,v 1.29 2024/06/27 16:39:31 florian Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. diff --git a/usr.sbin/dhcrelay/dhcrelay.8 b/usr.sbin/dhcrelay/dhcrelay.8 index f52d28f8dbf..898484bef7c 100644 --- a/usr.sbin/dhcrelay/dhcrelay.8 +++ b/usr.sbin/dhcrelay/dhcrelay.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhcrelay.8,v 1.18 2023/03/02 17:09:54 jmc Exp $ +.\" $OpenBSD: dhcrelay.8,v 1.19 2024/06/27 16:39:31 florian 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 2 2023 $ +.Dd $Mdocdate: June 27 2024 $ .Dt DHCRELAY 8 .Os .Sh NAME @@ -121,8 +121,8 @@ If this option is not specified, it will use the destination address by default. Replace incoming Relay Agent Information with the one configured. .El .Sh SEE ALSO -.Xr dhclient 8 , -.Xr dhcpd 8 +.Xr dhcpd 8 , +.Xr dhcpleased 8 .Sh STANDARDS .Rs .%A R. Droms @@ -168,6 +168,6 @@ Relayed DHCP traffic could actually safely be protected by IPsec but, like .Xr dhcpd 8 and -.Xr dhclient 8 , +.Xr dhcpleased 8 , .Nm will bypass IPsec for all its traffic.