From 361a1b3ed40fed23885100d7212c8a2df440ebb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Mon, 2 Nov 2009 17:56:31 +0000
Subject: [PATCH] The wizards do not set the rule type and queues should be
 enabled even on block rules so add the queues to the rules even if the type
 of rule is not set(which means pass btw). This unbreaks the traffic shaper
 wizards and block shaping rules.

---
 etc/inc/filter.inc | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index f7d10ae44b..2144fc09c5 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1527,26 +1527,24 @@ function filter_generate_user_rule($rule)
 		/* special reject packet */
 		$aline['flags'] .= "flags S/SA ";
 	}
-	if ($type == "pass") {
-		if ($rule['defaultqueue'] <> "") {
-			$aline['queue'] = " queue (".$rule['defaultqueue'];
-			if ($rule['ackqueue'] <> "")
-				$aline['queue'] .= ",".$rule['ackqueue'];
-			$aline['queue'] .= ") ";
-		}
-		if ($rule['dnpipe'] <> "") {
-			if ($rule['dnpipe'][0] == "?") {
-				$aline['dnpipe'] = " dnqueue( ";
-				$aline['dnpipe'] .= substr($rule['dnpipe'],1);
-				if ($rule['pdnpipe'] <> "")
-					$aline['dnpipe'] .= ",".substr($rule['pdnpipe'], 1);
-			} else {
-				$aline['dnpipe'] = " dnpipe ( " . $rule['dnpipe'];
-				if ($rule['pdnpipe'] <> "")
-					$aline['dnpipe'] .= ", " . $rule['pdnpipe'];
-			}
-			$aline['dnpipe'] .= ") ";
+	if ($rule['defaultqueue'] <> "") {
+		$aline['queue'] = " queue (".$rule['defaultqueue'];
+		if ($rule['ackqueue'] <> "")
+			$aline['queue'] .= ",".$rule['ackqueue'];
+		$aline['queue'] .= ") ";
+	}
+	if ($rule['dnpipe'] <> "") {
+		if ($rule['dnpipe'][0] == "?") {
+			$aline['dnpipe'] = " dnqueue( ";
+			$aline['dnpipe'] .= substr($rule['dnpipe'],1);
+			if ($rule['pdnpipe'] <> "")
+				$aline['dnpipe'] .= ",".substr($rule['pdnpipe'], 1);
+		} else {
+			$aline['dnpipe'] = " dnpipe ( " . $rule['dnpipe'];
+			if ($rule['pdnpipe'] <> "")
+				$aline['dnpipe'] .= ", " . $rule['pdnpipe'];
 		}
+		$aline['dnpipe'] .= ") ";
 	}
 
 	/* is a time based rule schedule attached? */