diff options
| author | Colin Smith <colin@pfsense.org> | 2005-03-16 00:20:39 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-03-16 00:20:39 +0000 |
| commit | a6345863a40097426ffa90d3fd96ab6b4d163ff0 (patch) | |
| tree | 869b9e951ab53a423dcc46977b4e809bab711fce /etc | |
| parent | 3c2a4809cd2be1bc50c0700cad141eb10257597e (diff) | |
| download | pfsense-a6345863a40097426ffa90d3fd96ab6b4d163ff0.zip pfsense-a6345863a40097426ffa90d3fd96ab6b4d163ff0.tar.gz | |
Use is_package_installed() for both squid-specific IFs.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 62eb50f..0e67a12 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -959,8 +959,7 @@ function filter_rules_generate() { $log = ""; /* if squid is installed, lets install its rule */ - $squid_installed = run_command_return_string("/bin/ls {$g['vardb_path']}/pkg/ | grep squid"); - if ($squid_installed <> "") { + if (is_package_installed("squid") == 1) { $ipfrules .= "pass in quick on " . $lanif . " inet proto tcp from any to 127.0.0.1 port 3128 flags S/SA keep state label \"transparent proxy\"\n"; $ipfrules .= "pass out quick on " . $wanif . " inet proto tcp from ($wanif) to any port www flags S/SA keep state label \"transparent proxy\"\n"; } @@ -1674,4 +1673,4 @@ function create_firewall_outgoing_rules_to_itself() { return $rule; } -?>
\ No newline at end of file +?> |
