From b6f56d02df233446c71d65599408c3372b3622cf Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 13 Feb 2005 01:06:22 +0000
Subject: [PATCH] Correctly setup pptp rules, do not attempt to label rdr rule.

---
 etc/inc/filter.inc | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index bbb4545519..f397abc3f6 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -342,6 +342,8 @@ function filter_generate_aliases() {
 	$aliases .= "# System Aliases \n";
 	$aliases .= "lan = \"{ " . $config['interfaces']['lan']['if'] . " }\"\n";
 	$aliases .= "wan = \"{ " . get_real_wan_interface() . " }\"\n";
+	$aliases .= "pptp = \"{  }\"\n";
+
 	$ifdescrs = array();
 	for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
 		$ifdescrs['opt' . $j] = "opt" . $j;
@@ -822,7 +824,7 @@ function filter_nat_rules_generate() {
 
 # PPTP
 #rdr on $wanif proto gre from any to any port 0 -> $pptpdtarget
-rdr on $wanif proto tcp from any to any port 1723 -> $pptpdtarget label "pptp port 1723"
+rdr on $wanif proto tcp from any to any port 1723 -> $pptpdtarget
 
 EOD;
 		}
@@ -1247,14 +1249,14 @@ EOD;
 
 			if ($ispptp) {
 				$line .= "on ng" . ($iif+1) . " ";
+			} else {
+				// translate wan, man, lan, opt to real interface.
+				$interface = $rule['interface'];
+				$temp = filter_get_opt_interface_descr($interface);
+				if($temp <> "") $interface = $temp;
+				$line .= "on \$" . $interface . " ";
 			}
 
-			// translate wan, man, lan, opt to real interface.
-			$interface = $rule['interface'];
-			$temp = filter_get_opt_interface_descr($interface);
-			if($temp <> "") $interface = $temp;
-			$line .= "on \$" . $interface . " ";
-
 			if (isset($rule['protocol'])) {
 				if($rule['protocol'] == "tcp/udp")
 					$line .= "proto { tcp udp } ";