summaryrefslogtreecommitdiff
path: root/sbin/pfctl
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2006-10-25 14:50:31 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2006-10-25 14:50:31 +0000
commit1d9f6e0be3668f73bc9214b9d5fd4243f89b357b (patch)
tree9cc8e0e9b8c24ac7d1c28195b5a97d65434d1154 /sbin/pfctl
parent0c2aec7bf30ece5465aa727d418bee0227192274 (diff)
make absolutely sure logif is 0 unless set specifically, even if log is 0.
logif is to be considered invalid unless log is set, but we need this to please the optimizer...
Diffstat (limited to 'sbin/pfctl')
-rw-r--r--sbin/pfctl/parse.y12
1 files changed, 6 insertions, 6 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 4533372bdda..e7116136a7b 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.511 2006/10/25 11:53:46 henning Exp $ */
+/* $OpenBSD: parse.y,v 1.512 2006/10/25 14:50:30 henning Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -2111,11 +2111,11 @@ quick : /* empty */ { $$.quick = 0; }
| QUICK { $$.quick = 1; }
;
-logquick : /* empty */ { $$.log = 0; $$.quick = 0; }
- | log { $$ = $1; $$.quick = 0; }
- | QUICK { $$.quick = 1; $$.log = 0; }
- | log QUICK { $$ = $1; $$.quick = 1; }
- | QUICK log { $$ = $2; $$.quick = 1; }
+logquick : /* empty */ { $$.log = 0; $$.quick = 0; $$.logif = 0; }
+ | log { $$ = $1; $$.quick = 0; }
+ | QUICK { $$.quick = 1; $$.log = 0; $$.logif = 0; }
+ | log QUICK { $$ = $1; $$.quick = 1; }
+ | QUICK log { $$ = $2; $$.quick = 1; }
;
log : LOG { $$.log = PF_LOG; $$.logif = 0; }