summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hartmeier <dhartmei@cvs.openbsd.org>2002-10-25 15:18:21 +0000
committerDaniel Hartmeier <dhartmei@cvs.openbsd.org>2002-10-25 15:18:21 +0000
commit65d67de39117edddc54d81c3388e54f1d0546f9d (patch)
treeb923c2db41755b53a8c34b93646310a4b910e50d
parent1116bfd151f96821ebdbaeb8543ce4097979d9d8 (diff)
Compare pf_rule->label in pf_compare_rules(), too.
Found by DJ Gregor.
-rw-r--r--sys/net/pf_ioctl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 477fd22057c..acfe9650da1 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_ioctl.c,v 1.12 2002/10/22 00:39:23 mcbride Exp $ */
+/* $OpenBSD: pf_ioctl.c,v 1.13 2002/10/25 15:18:20 dhartmei Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -165,7 +165,8 @@ pf_compare_rules(struct pf_rule *a, struct pf_rule *b)
a->rule_flag != b->rule_flag ||
a->min_ttl != b->min_ttl ||
a->tos != b->tos ||
- a->allow_opts != b->allow_opts)
+ a->allow_opts != b->allow_opts ||
+ a->ifnot != b->ifnot)
return (1);
if (PF_ANEQ(&a->src.addr.addr, &b->src.addr.addr, a->af) ||
PF_ANEQ(&a->src.mask, &b->src.mask, a->af) ||
@@ -181,9 +182,8 @@ pf_compare_rules(struct pf_rule *a, struct pf_rule *b)
a->dst.not != b->dst.not ||
a->dst.port_op != b->dst.port_op)
return (1);
- if (strcmp(a->ifname, b->ifname))
- return (1);
- if (a->ifnot != b->ifnot)
+ if (strcmp(a->ifname, b->ifname) ||
+ strcmp(a->label, b->label))
return (1);
return (0);
}