diff options
| author |   florian <florian@openbsd.org> | 2019-01-24 15:59:32 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2019-01-24 15:59:32 +0000 |
| commit | 5e1857f6db99e2eb3b2b07e0010124973be512e8 (patch) | |
| tree | b96dc1bd6730ff4b0484ec27eb412f76ea418a51 | |
| parent | Set pointer variables in tls13 handshake to NULL on clear (diff) | |
| download | wireguard-openbsd-5e1857f6db99e2eb3b2b07e0010124973be512e8.tar.xz wireguard-openbsd-5e1857f6db99e2eb3b2b07e0010124973be512e8.zip | |
fix shift/reduce conflict
| -rw-r--r-- | sbin/unwind/uw_parse.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/unwind/uw_parse.y b/sbin/unwind/uw_parse.y index 6f24bbad45a..000c6888481 100644 --- a/sbin/unwind/uw_parse.y +++ b/sbin/unwind/uw_parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: uw_parse.y,v 1.1 2019/01/23 13:11:00 florian Exp $ */ +/* $OpenBSD: uw_parse.y,v 1.2 2019/01/24 15:59:32 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -190,11 +190,11 @@ nl : '\n' optnl /* one or more newlines */ unwind_forwarder : FORWARDER forwarder_block ; -forwarder_block : '{' optnl forwarderopts_l optnl '}' +forwarder_block : '{' optnl forwarderopts_l '}' | forwarderoptsl ; -forwarderopts_l : forwarderopts_l forwarderoptsl optnl +forwarderopts_l : forwarderopts_l forwarderoptsl nl | forwarderoptsl optnl forwarderoptsl : STRING { |