Author: pfg
Date: Thu Feb 1 02:00:36 2018
New Revision: 328649
URL: https://svnweb.freebsd.org/changeset/base/328649
Log:
MFC r328497:
pfctl(8): Fix two wrong conditions.
Caught by gcc80's -Wtautological-compare option.
MFC after: 5 days
Reviewed by: kp
Obtained from: DragonFlyBSD (git e3cdbf6c)
Modified:
stable/10/sbin/pfctl/pfctl_optimize.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sbin/pfctl/pfctl_optimize.c
==============================================================================
--- stable/10/sbin/pfctl/pfctl_optimize.c Thu Feb 1 01:59:37 2018
(r328648)
+++ stable/10/sbin/pfctl/pfctl_optimize.c Thu Feb 1 02:00:36 2018
(r328649)
@@ -1091,7 +1091,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);
@@ -1163,7 +1163,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);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
