diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2024-11-11 15:19:32 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2024-11-11 15:19:32 +0000 |
| commit | c21d6317b4922352b8eedd78b8959ae013c58469 (patch) | |
| tree | a9805d70f51e7f226dcb7d6fba041707cf6a7b71 /sbin | |
| parent | 9574fb49e85674125b0b2d6cadea7a00965bd85b (diff) | |
Prevent completely empty interface blocks.
This is meaningless in dhcpleased(8) and *not* needed to receive
leases for an interface. In fact dhcpleased(8) works just fine without
any configuration file at all.
man page diff & OK kn
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhcpleased/dhcpleased.conf.5 | 6 | ||||
| -rw-r--r-- | sbin/dhcpleased/parse.y | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sbin/dhcpleased/dhcpleased.conf.5 b/sbin/dhcpleased/dhcpleased.conf.5 index 7566aca82f7..fdf9a6ac46c 100644 --- a/sbin/dhcpleased/dhcpleased.conf.5 +++ b/sbin/dhcpleased/dhcpleased.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhcpleased.conf.5,v 1.14 2024/11/09 12:44:12 kn Exp $ +.\" $OpenBSD: dhcpleased.conf.5,v 1.15 2024/11/11 15:19:31 florian Exp $ .\" .\" Copyright (c) 2018, 2021 Florian Obser <florian@openbsd.org> .\" Copyright (c) 2005 Esben Norby <norby@openbsd.org> @@ -18,7 +18,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 9 2024 $ +.Dd $Mdocdate: November 11 2024 $ .Dt DHCPLEASED.CONF 5 .Os .Sh NAME @@ -51,7 +51,7 @@ Macros are not expanded inside quotes. .Sh INTERFACES A list of interfaces to overwrite defaults: .Bl -tag -width Ds -.It Ic interface Ar name Brq Op Ar option ... +.It Ic interface Ar name Brq Ar option ... .Pp .Ic interface options are as follows: diff --git a/sbin/dhcpleased/parse.y b/sbin/dhcpleased/parse.y index 4414684e03c..501d13dbcac 100644 --- a/sbin/dhcpleased/parse.y +++ b/sbin/dhcpleased/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.9 2024/06/03 17:58:33 deraadt Exp $ */ +/* $OpenBSD: parse.y,v 1.10 2024/11/11 15:19:31 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -172,7 +172,6 @@ dhcp_iface : DHCP_IFACE STRING { ; iface_block : optnl ifaceopts_l - | optnl ; ifaceopts_l : ifaceopts_l ifaceoptsl nl |