diff options
| author | robscool <robrob2626@yahoo.com> | 2009-04-15 23:22:44 -0700 |
|---|---|---|
| committer | robscool <robrob2626@yahoo.com> | 2009-04-15 23:22:44 -0700 |
| commit | 1df0f5f95e278e87baeb2d24777787d7440bf398 (patch) | |
| tree | a1ee87e2c629f5711da5a97128ea4381f362790f /config/squid/squid.inc | |
| parent | ba31b103f4a007298a5bbacd2dc601ab02ee381c (diff) | |
| parent | 81f2a76427d57c091fb0320a053621974adb37a9 (diff) | |
| download | pfsense-packages-1df0f5f95e278e87baeb2d24777787d7440bf398.tar.gz pfsense-packages-1df0f5f95e278e87baeb2d24777787d7440bf398.tar.bz2 pfsense-packages-1df0f5f95e278e87baeb2d24777787d7440bf398.zip | |
Merge commit 'mainline/master'
Diffstat (limited to 'config/squid/squid.inc')
| -rw-r--r-- | config/squid/squid.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 113bc09f..0f94c1e5 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -1248,7 +1248,9 @@ function squid_generate_rules($type) { $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'] != "off") { +// if($config['pptpd']['mode'] != "off") { +// <mode> is not present in config.xml after disabling "redir" + if($config['pptpd']['mode'] == "server") { $rules .= "rdr on \$pptp proto tcp from any to !(\$pptp) port 80 -> 127.0.0.1 port 80\n"; } $rules .= "\n"; @@ -1263,7 +1265,9 @@ function squid_generate_rules($type) { if($config['pppoe']['mode'] == "off") { $rules .= "pass in quick on \$pppoe proto tcp from any to !(\$pppoe) port $port flags S/SA keep state\n"; } - if($config['pptpd']['mode'] != "off") { +// if($config['pptpd']['mode'] != "off") { +// <mode> is not present in config.xml after disabling "redir" + if($config['pptpd']['mode'] == "server") { $rules .= "pass in quick on \$pptp proto tcp from any to !(\$pptp) port $port flags S/SA keep state\n"; } break; |