summaryrefslogtreecommitdiff
path: root/sbin/dhcpleased
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2021-07-27 13:28:26 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2021-07-27 13:28:26 +0000
commitb243262bd2ed6cf4a33cfe32da86e1d11b80f545 (patch)
treec2722655515a6c24ef0403e5626a8c0c01b694eb /sbin/dhcpleased
parentd39f8d30be07078a3399bf917ff3bb4e9ab21a26 (diff)
'{' and '}' are fixed parts of the 'interface' decleration', not optional.
concern raised by kn. ok florian
Diffstat (limited to 'sbin/dhcpleased')
-rw-r--r--sbin/dhcpleased/parse.y9
1 files changed, 4 insertions, 5 deletions
diff --git a/sbin/dhcpleased/parse.y b/sbin/dhcpleased/parse.y
index 21b2383a44c..947ed038f95 100644
--- a/sbin/dhcpleased/parse.y
+++ b/sbin/dhcpleased/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.1 2021/07/26 09:26:36 florian Exp $ */
+/* $OpenBSD: parse.y,v 1.2 2021/07/27 13:28:25 deraadt Exp $ */
/*
* Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -165,14 +165,13 @@ nl : '\n' optnl /* one or more newlines */
dhcp_iface : DHCP_IFACE STRING {
iface_conf = conf_get_iface($2);
- } iface_block {
+ } '{' iface_block '}' {
iface_conf = NULL;
}
;
-iface_block : '{' optnl ifaceopts_l '}'
- | '{' optnl '}'
- | /* empty */
+iface_block : optnl ifaceopts_l
+ | optnl
;
ifaceopts_l : ifaceopts_l ifaceoptsl nl