From 5d8111c43e4e35019a0f7fc97220e6ce0cf3a1eb Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 19 Jan 2018 10:09:09 +0100 Subject: [PATCH] pfctl(8): Fix two wrong conditions. Caught by gcc80's -Wtautological-compare option. --- usr.sbin/pfctl/pfctl_optimize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pfctl/pfctl_optimize.c b/usr.sbin/pfctl/pfctl_optimize.c index b5e488728e..46b7a05b3e 100644 --- a/usr.sbin/pfctl/pfctl_optimize.c +++ b/usr.sbin/pfctl/pfctl_optimize.c @@ -1084,7 +1084,7 @@ skip_cmp_dst_addr(struct pf_rule *a, struct pf_rule *b) return (0); case PF_ADDR_DYNIFTL: if (strcmp(a->dst.addr.v.ifname, b->dst.addr.v.ifname) != 0 || - a->dst.addr.iflags != a->dst.addr.iflags || + a->dst.addr.iflags != b->dst.addr.iflags || memcmp(&a->dst.addr.v.a.mask, &b->dst.addr.v.a.mask, sizeof(a->dst.addr.v.a.mask))) return (1); @@ -1156,7 +1156,7 @@ skip_cmp_src_addr(struct pf_rule *a, struct pf_rule *b) return (0); case PF_ADDR_DYNIFTL: if (strcmp(a->src.addr.v.ifname, b->src.addr.v.ifname) != 0 || - a->src.addr.iflags != a->src.addr.iflags || + a->src.addr.iflags != b->src.addr.iflags || memcmp(&a->src.addr.v.a.mask, &b->src.addr.v.a.mask, sizeof(a->src.addr.v.a.mask))) return (1); -- 2.41.0