diff options
Diffstat (limited to 'etc/inc/filter.inc')
| -rw-r--r-- | etc/inc/filter.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 451389f..62eb50f 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -880,10 +880,8 @@ EOD; } } - $squid_installed = run_command_return_string("/bin/ls {$g['vardb_path']}/pkg/ | grep squid"); - if ($squid_installed <> "") { + if (is_package_installed("squid") == 1) $natrules .= "rdr on " . $lanif . " inet proto tcp from any to !{$lanip} port www -> 127.0.0.1 port 3128\n"; - } return $natrules; } @@ -1356,7 +1354,7 @@ EOD; if($rule['returngateway'] <> "") { $line .= "reply-to (" . $rule['returngateway'] . ") "; } - + if (isset($rule['protocol'])) { if($rule['protocol'] == "tcp/udp") $line .= "proto { tcp udp } "; |
