diff options
| -rw-r--r-- | sbin/pfctl/pf_print_state.c | 4 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl.c | 10 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_table.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 3511c5da663..e36b1fd94bf 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_print_state.c,v 1.43 2006/03/14 11:09:44 djm Exp $ */ +/* $OpenBSD: pf_print_state.c,v 1.44 2007/03/01 17:20:53 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -292,7 +292,7 @@ print_state(struct pf_state *s, int opts) if (opts & PF_OPT_VERBOSE2) { printf(" id: %016llx creatorid: %08x%s\n", betoh64(s->id), ntohl(s->creatorid), - (s->sync_flags & PFSTATE_NOSYNC ? " (no-sync)" : "")); + ((s->sync_flags & PFSTATE_NOSYNC) ? " (no-sync)" : "")); } } diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 6ecf144a177..cf338c7d40b 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.261 2007/02/23 21:31:52 deraadt Exp $ */ +/* $OpenBSD: pfctl.c,v 1.262 2007/03/01 17:20:53 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -873,7 +873,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, if (pr.anchor_call[0] && ((((p = strrchr(pr.anchor_call, '_')) != NULL) && ((void *)p == (void *)pr.anchor_call || - *(--p) == '/')) || opts & PF_OPT_RECURSE)) { + *(--p) == '/')) || (opts & PF_OPT_RECURSE))) { brace++; if ((p = strrchr(pr.anchor_call, '/')) != NULL) @@ -1929,9 +1929,9 @@ pfctl_show_anchors(int dev, int opts, char *anchorname) strlcat(sub, "/", sizeof(sub)); } strlcat(sub, pr.name, sizeof(sub)); - if (sub[0] != '_' || opts & PF_OPT_VERBOSE) + if (sub[0] != '_' || (opts & PF_OPT_VERBOSE)) printf(" %s\n", sub); - if (opts & PF_OPT_VERBOSE && pfctl_show_anchors(dev, opts, sub)) + if ((opts & PF_OPT_VERBOSE) && pfctl_show_anchors(dev, opts, sub)) return (-1); } return (0); @@ -2230,7 +2230,7 @@ main(int argc, char *argv[]) } } - if (opts & PF_OPT_CLRRULECTRS && showopt == NULL) + if ((opts & PF_OPT_CLRRULECTRS) && showopt == NULL) pfctl_show_rules(dev, path, opts, PFCTL_SHOW_NOTHING, anchorname, 0); diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 23072eac72a..bee57862650 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_table.c,v 1.65 2007/01/18 20:45:55 henning Exp $ */ +/* $OpenBSD: pfctl_table.c,v 1.66 2007/03/01 17:20:54 deraadt Exp $ */ /* * Copyright (c) 2002 Cedric Berger @@ -174,7 +174,7 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, break; } - if (opts & PF_OPT_SHOWALL && b.pfrb_size > 0) + if ((opts & PF_OPT_SHOWALL) && b.pfrb_size > 0) pfctl_print_title("TABLES:"); PFRB_FOREACH(p, &b) @@ -326,7 +326,7 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, RVTEST(pfr_tst_addrs(&table, b.pfrb_caddr, b.pfrb_size, &nmatch, flags)); xprintf(opts, "%d/%d addresses match", nmatch, b.pfrb_size); - if (opts & PF_OPT_VERBOSE && !(opts & PF_OPT_VERBOSE2)) + if ((opts & PF_OPT_VERBOSE) && !(opts & PF_OPT_VERBOSE2)) PFRB_FOREACH(a, &b) if (a->pfra_fback == PFR_FB_MATCH) print_addrx(a, NULL, |