From 0ee96a458ab93ff451c9bb32b1b8bc20e13866e6 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 5 Jul 2013 11:26:04 -0400
Subject: [PATCH] Correct DHCPv6 rules test to also include a check for DHCPv6
 relay. Fixes #3074

---
 etc/inc/filter.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 1db82a3121..090c86836f 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2743,7 +2743,8 @@ EOD;
 		}
 			break;
 		default:
-			if ((is_array($config['dhcpdv6'][$on]) && isset($config['dhcpdv6'][$on]['enable'])) || isset($oc['track6-interface'])) {
+			if ((is_array($config['dhcpdv6'][$on]) && isset($config['dhcpdv6'][$on]['enable'])) || isset($oc['track6-interface']) 
+				|| (is_array($config['dhcrelay6']) && !empty($config['dhcrelay6']['interface']) && in_array($on, explode(',', $config['dhcrelay6']['interface'])))) {
 				$ipfrules .= <<<EOD
 # allow access to DHCPv6 server on {$oc['descr']}
 # We need inet6 icmp for stateless autoconfig and dhcpv6