From aa115b2f3e08730d4a458e83b9f3aa47ef64698f Mon Sep 17 00:00:00 2001 From: Ermal Date: Thu, 22 Jul 2010 15:17:18 +0000 Subject: [PATCH] Fixes #463. Actually define the correct variable so the pptp rdr rules can be added to the config. --- etc/inc/filter.inc | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index af4619d69f..c48038176e 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 .= <<