From 4e8c21be7613fa6657ab54f41ee3d90ee34a4231 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sat, 18 Apr 2009 18:34:08 -0400 Subject: Only install if localip is set and mode == server --- config/squid/squid.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 1980e1de..fb437d5b 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -1244,11 +1244,11 @@ function squid_generate_rules($type) { $rules .= "rdr on $iface proto tcp from any to !($iface) port 80 -> 127.0.0.1 port 80\n"; } /* Handle PPPOE case */ - if($config['pppoe']['mode'] == "server") { + if($config['pppoe']['mode'] == "server" && $config['pppoe']['localip']) { $rules .= "rdr on \$pppoe proto tcp from any to !(\$pppoe) port 80 -> 127.0.0.1 port 80\n"; } /* Handle PPTP case */ - if($config['pptpd']['mode'] == "server") { + if($config['pptpd']['mode'] == "server" && $config['pptpd']['localip']) { $rules .= "rdr on \$pptp proto tcp from any to !(\$pptp) port 80 -> 127.0.0.1 port 80\n"; } $rules .= "\n"; @@ -1260,10 +1260,10 @@ function squid_generate_rules($type) { $rules .= "pass in quick on $iface proto tcp from any to !($iface) port $port flags S/SA keep state\n"; $rules .= "\n"; }; - if($config['pppoe']['mode'] == "server") { + if($config['pppoe']['mode'] == "server" && $config['pppoe']['localip']) { $rules .= "pass in quick on \$pppoe proto tcp from any to !(\$pppoe) port $port flags S/SA keep state\n"; } - if($config['pptpd']['mode'] == "server") { + if($config['pptpd']['mode'] == "server" && $config['pptpd']['localip']) { $rules .= "pass in quick on \$pptp proto tcp from any to !(\$pptp) port $port flags S/SA keep state\n"; } break; -- cgit v1.2.3