summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-02-26 20:27:21 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-02-26 20:27:21 +0000
commit7bdce15ae122a934c87202a8cbab0ed3e6fd5f9b (patch)
treef8b4cd5de67a15bb1adc50b944da1cd0ac5fc305 /sbin
parent31ca583dc1fecb4c45b5c368ea6797ae7e167634 (diff)
in expand_rule, correctly set r->pqid if a priority queue was defined, and
reuse the value of r->qid if not. ok dhartmei@ mcbride@
Diffstat (limited to 'sbin')
-rw-r--r--sbin/pfctl/parse.y4
1 files changed, 3 insertions, 1 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 41a3b45e593..29eb4f86166 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.331 2003/02/25 20:59:09 henning Exp $ */
+/* $OpenBSD: parse.y,v 1.332 2003/02/26 20:27:20 henning Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -3296,6 +3296,8 @@ expand_rule(struct pf_rule *r,
expand_label(r->label, r->ifname, r->af, src_host, src_port,
dst_host, dst_port, proto->proto);
r->qid = qname_to_qid(r->qname, r->ifname);
+ if ((r->pqid = qname_to_qid(r->pqname, r->ifname)) == 0)
+ r->pqid = r->qid;
r->ifnot = interface->not;
r->proto = proto->proto;
r->src.addr = src_host->addr;