summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikeb <mikeb@openbsd.org>2014-07-02 13:03:41 +0000
committermikeb <mikeb@openbsd.org>2014-07-02 13:03:41 +0000
commitc81d20782e3c74cd88c18b303a2f28e6ceb144e7 (patch)
treed143502324a3810692204e691963332c785e4666
parentbetter indentation (diff)
downloadwireguard-openbsd-c81d20782e3c74cd88c18b303a2f28e6ceb144e7.tar.xz
wireguard-openbsd-c81d20782e3c74cd88c18b303a2f28e6ceb144e7.zip
condition above makes this part of the check useless;
overlooked in the previous commit
-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 973c5a6fb9f..93d82a57377 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.635 2014/06/30 13:17:17 mikeb Exp $ */
+/* $OpenBSD: parse.y,v 1.636 2014/07/02 13:03:41 mikeb Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -4306,9 +4306,9 @@ collapse_redirspec(struct pf_pool *rpool, struct pf_rule *r,
/* set rule address family if redirect spec has one */
if (rs->af && !r->af && !af) {
/* swap address families for af-to */
- if (r->naf == AF_INET6 && rs->af == AF_INET6)
+ if (r->naf == AF_INET6)
af = AF_INET;
- else if (r->naf == AF_INET && rs->af == AF_INET)
+ else if (r->naf == AF_INET)
af = AF_INET6;
else
af = rs->af;