From 18bdd5596e34d387beb411af11007879bb3486bc Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Mon, 21 Apr 2008 01:42:20 +0000 Subject: optnl is a crutch for those who do not understand yacc. it leads to a variety of errors; ok mcbride --- sbin/pfctl/parse.y | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'sbin/pfctl') diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index c4189963198..19b361dfcdc 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.536 2008/02/01 06:58:45 mcbride Exp $ */ +/* $OpenBSD: parse.y,v 1.537 2008/04/21 01:42:19 deraadt Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -702,14 +702,10 @@ anchorname : STRING { $$ = $1; } | /* empty */ { $$ = NULL; } ; -optnl : optnl '\n' - | - ; - -pfa_anchorlist : pfrule optnl - | anchorrule optnl - | pfa_anchorlist pfrule optnl - | pfa_anchorlist anchorrule optnl +pfa_anchorlist : /* empty */ + | pfa_anchorlist '\n' + | pfa_anchorlist pfrule '\n' + | pfa_anchorlist anchorrule '\n' ; pfa_anchor : '{' -- cgit v1.2.3