From 1b8bf91446a8b2f090787da0bef506ea31008063 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sun, 9 Aug 2009 20:20:39 -0400 Subject: Unbreak packages that use filter_configure_* on 2.0 --- config/squid3/squid.inc | 4 +++- config/squid3/squid_ng.inc | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'config/squid3') diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc index 3aa3c95c..efd3388b 100644 --- a/config/squid3/squid.inc +++ b/config/squid3/squid.inc @@ -34,9 +34,11 @@ require_once('config.inc'); require_once('util.inc'); require_once('pfsense-utils.inc'); require_once('pkg-utils.inc'); -require_once('filter.inc'); require_once('service-utils.inc'); +if(!function_exists("filter_configure")) + requre_once("filter.inc"); + define('SQUID_CONFBASE', '/usr/local/etc/squid'); define('SQUID_ACLDIR', '/var/squid/acl'); define('SQUID_PASSWD', '/var/etc/squid.passwd'); diff --git a/config/squid3/squid_ng.inc b/config/squid3/squid_ng.inc index dc18e349..f54448ae 100644 --- a/config/squid3/squid_ng.inc +++ b/config/squid3/squid_ng.inc @@ -31,6 +31,9 @@ */ +if(!function_exists("filter_configure")) + requre_once("filter.inc"); + function global_write_squid_config() { global $config; -- cgit v1.2.3