summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2012-07-10 09:13:42 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2012-07-10 09:13:42 +0000
commit4026ceb8d1f5fa7a51310bb1ca2925435dfad19a (patch)
tree6545d440c9f8ac0c7fc26d89d4bcc28798d353d1 /sbin
parente5377fb3d709abd2d04ba8990e49dc31dc97302a (diff)
set { ... } -> set ( ... )
brought up by ryan, discussed with him and theo and they convinced me
Diffstat (limited to 'sbin')
-rw-r--r--sbin/pfctl/parse.y4
-rw-r--r--sbin/pfctl/pfctl_parser.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index ea52bfebe24..9d1073edd02 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.616 2012/07/09 14:05:35 henning Exp $ */
+/* $OpenBSD: parse.y,v 1.617 2012/07/10 09:13:41 henning Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -2386,7 +2386,7 @@ filter_opt : USER uids {
| filter_sets
;
-filter_sets : SET '{' filter_sets_l '}' { $$ = filter_opts; }
+filter_sets : SET '(' filter_sets_l ')' { $$ = filter_opts; }
| SET filter_set { $$ = filter_opts; }
;
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 5b0533b3b34..3e81fd96166 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfctl_parser.c,v 1.286 2012/07/09 14:05:35 henning Exp $ */
+/* $OpenBSD: pfctl_parser.c,v 1.287 2012/07/10 09:13:41 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -846,7 +846,7 @@ print_rule(struct pf_rule *r, const char *anchor_call, int opts)
if (r->set_prio[0] != PF_PRIO_NOTSET ||
r->scrub_flags & PFSTATE_SETTOS) {
char *comma = "";
- printf(" set {");
+ printf(" set (");
if (r->set_prio[0] != PF_PRIO_NOTSET) {
if (r->set_prio[0] == r->set_prio[1])
printf("%s prio %u", comma, r->set_prio[0]);
@@ -859,7 +859,7 @@ print_rule(struct pf_rule *r, const char *anchor_call, int opts)
printf("%s tos 0x%2.2x", comma, r->set_tos);
comma = ",";
}
- printf(" }");
+ printf(" )");
}
ropts = 0;