summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2009-06-08 02:36:07 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2009-06-08 02:36:07 +0000
commit130407b9fc8e463aebf8eea8ccff1e6e078dc4bd (patch)
tree616d7300f64825ab0631f3900de90eec53e0d884
parent45ad2076e8e9aefb4607dd71e1c09c8e469fd1eb (diff)
"do not call PF_ANEQ with af=0, dragons". fixes a problem with skip
steps found with the recent pfvar.h commit to check address families. from & commit req by henning.
-rw-r--r--sys/net/pf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index b3da5a1ca67..bfb9ac9e0a5 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.649 2009/06/05 00:05:21 claudio Exp $ */
+/* $OpenBSD: pf.c,v 1.650 2009/06/08 02:36:06 sthen Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1468,9 +1468,9 @@ pf_addr_wrap_neq(struct pf_addr_wrap *aw1, struct pf_addr_wrap *aw2)
switch (aw1->type) {
case PF_ADDR_ADDRMASK:
case PF_ADDR_RANGE:
- if (PF_ANEQ(&aw1->v.a.addr, &aw2->v.a.addr, 0))
+ if (PF_ANEQ(&aw1->v.a.addr, &aw2->v.a.addr, AF_INET6))
return (1);
- if (PF_ANEQ(&aw1->v.a.mask, &aw2->v.a.mask, 0))
+ if (PF_ANEQ(&aw1->v.a.mask, &aw2->v.a.mask, AF_INET6))
return (1);
return (0);
case PF_ADDR_DYNIFTL: