From f9eb5ebb334675e0b4d83c5cbee92efd6178ffd4 Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Tue, 3 Apr 2012 13:12:49 +0200
Subject: [PATCH] Fix the comment text for 6to4 proto 41 rules. Make sure that
 the DHCPv6 firewall rules for track6 interfaces are added.

---
 etc/inc/filter.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index c032ca756f..b6607853b4 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2509,14 +2509,15 @@ EOD;
 		case "6to4":
 			$ipfrules .= <<<EOD
 
-# allow our proto 41 traffic from the 6RD border relay in
-pass in on \${$oc['descr']} proto 41 from 192.88.99.1 to {$oc['ip']} label "Allow 6in4 traffic in for 6rd on {$oc['descr']}"
-pass out on \${$oc['descr']} proto 41 from {$oc['ip']} to 192.88.99.1 label "Allow 6in4 traffic out for 6rd on {$oc['descr']}"
+# allow our proto 41 traffic from the 6to4 border relay in
+pass in on \${$oc['descr']} proto 41 from 192.88.99.1 to {$oc['ip']} label "Allow 6in4 traffic in for 6to4 on {$oc['descr']}"
+pass out on \${$oc['descr']} proto 41 from {$oc['ip']} to 192.88.99.1 label "Allow 6in4 traffic out for 6to4 on {$oc['descr']}"
 
 EOD;
 			break;
 		default:
-			if(isset($config['dhcpdv6'][$on]['enable'])) {
+			if((isset($config['dhcpdv6'][$on]['enable'])) ||
+					(isset($config['interfaces'][$on]['track6-interface']))) {
 				$ipfrules .= <<<EOD
 
 # allow access to DHCPv6 server on {$oc['descr']}