summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2010-01-12 16:22:50 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2010-01-12 16:22:50 +0000
commit0b2f53b0324cd9148589b9c59b21ce7dfce0732b (patch)
treece099e558fe0cc0c5f6ab0e2a10843f2c3cdebcb
parent0500365299fa162c353e28bfb1e5b48fdf3fbad9 (diff)
Set roundrobin flag correctly, and don't treat a bare interface
like a dynamic one in the routespec.
-rw-r--r--sbin/pfctl/parse.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index d53a893acd4..b0f23ca2f19 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.584 2010/01/12 15:52:07 mcbride Exp $ */
+/* $OpenBSD: parse.y,v 1.585 2010/01/12 16:22:49 mcbride Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -3731,7 +3731,7 @@ route_host : STRING {
if ($$ == NULL)
err(1, "route_host: calloc");
$$->ifname = $1;
- $$->addr.type = PF_ADDR_DYNIFTL;
+ $$->addr.type = PF_ADDR_NONE;
set_ipmask($$, 128);
$$->next = NULL;
$$->tail = $$;
@@ -4623,7 +4623,7 @@ apply_redirspec(struct pf_pool *rpool, struct pf_rule *r, struct redirspec *rs,
rpool->opts = rs->pool_opts.type;
if (rpool->addr.type == PF_ADDR_TABLE ||
DYNIF_MULTIADDR(rpool->addr))
- rpool->opts = PF_POOL_ROUNDROBIN;
+ rpool->opts |= PF_POOL_ROUNDROBIN;
if (rs->pool_opts.key != NULL)
memcpy(&rpool->key, rs->pool_opts.key,