From e7abb4184a728ee780ec7478cdc890b97fe2e456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Mon, 21 Jan 2008 22:40:50 +0000
Subject: [PATCH] Remove a duplicated entry slipped in accidentally. Remove
 uneeded check on default policy.

---
 etc/inc/filter.inc | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index ffd7d32c91..af982d5624 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2244,11 +2244,6 @@ function filter_rules_generate() {
 	$optcfg = array();
 	generate_optcfg_array($optcfg);
 
-	if (is_package_installed('squid') && file_exists('/usr/local/pkg/squid.inc')) {
-		require_once('squid.inc');
-		$ipfrules .= squid_generate_rules('filter');
-	}
-
 	if (is_package_installed('clamav') && file_exists('/usr/local/pkg/clamav.inc')) {
 		require_once('clamav.inc');
 		$ipfrules .= clamav_generate_rules('filter');
@@ -2455,8 +2450,6 @@ pass proto icmp from {$wanip} to any keep state
 
 EOD;
 
-if (!is_array($config['shaper']['queue']) && count($config['shaper']['queue']) < 1) {
-
 	$ipfrules .= <<<EOD
 
 # let out anything from the firewall host itself and decrypted IPsec traffic
@@ -2466,8 +2459,6 @@ pass out on \$lan proto icmp keep state label "let out anything from firewall ho
 
 EOD;
 
-}
-
 	$ipfrules .= create_firewall_outgoing_rules_to_itself();
 
 	if($config['interfaces']['wan']['ipaddr'] == "pppoe")