diff options
| author | Ermal <eri@pfsense.org> | 2010-07-22 15:17:18 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-07-22 15:17:18 +0000 |
| commit | aa115b2f3e08730d4a458e83b9f3aa47ef64698f (patch) | |
| tree | 622cedb71319cf3e560c2f72b3800cfd1c7e139e /etc | |
| parent | 746e60c9ee05d270e8af303f51c9b669571b1b5a (diff) | |
| download | pfsense-aa115b2f3e08730d4a458e83b9f3aa47ef64698f.zip pfsense-aa115b2f3e08730d4a458e83b9f3aa47ef64698f.tar.gz | |
Fixes #463. Actually define the correct variable so the pptp rdr rules can be added to the config.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index af4619d..c480381 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1396,18 +1396,10 @@ function filter_nat_rules_generate() { else sigkillbypid("/var/run/inetd.pid", "HUP"); - if($pptpdcfg['mode'] && $pptpdcfg['mode'] != "off") { - if($pptpdcfg['mode'] == "server") - $pptpdtarget = "127.0.0.1"; - else if($pptpdcfg['mode'] == "redir") - $pptpdtarget = $pptpdcfg['redir']; - if($pptpdcfg['mode'] == "redir" && is_array($FilterIflist['wan'])) { - /* - * NB: ermal -- the rdr rule below is commented out now that we have a solution - * for PPTP passthrough. This unbreaks other GRE traffic passing - * through pfSense. - * After some more testing this will be removed compeletely. - */ + $pptpdcfg = $config['pptpd']; + if($pptpdcfg['mode'] && $pptpdcfg['mode'] == "redir") { + $pptpdtarget = $pptpdcfg['redir']; + if(is_ipaddr($pptpdtarget) && is_array($FilterIflist['wan'])) { $natrules .= <<<EOD # PPTP |
