From 3cfa11c259d140d6a2c43d11e7ba809eb7ff08bc Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 22 Dec 2009 16:29:36 -0500
Subject: [PATCH] Unbreak remote-ip box.  Mpd is now starting for ppptp server

---
 etc/inc/upgrade_config.inc |  2 ++
 usr/local/www/vpn_pptp.php | 15 +--------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 0a8cf45d46..586bc34286 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1833,4 +1833,6 @@ function upgrade_059_to_060() {
 	}
 }
 
+
+
 ?>
diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php
index 5dbe4d1947..d0ba58ecc1 100755
--- a/usr/local/www/vpn_pptp.php
+++ b/usr/local/www/vpn_pptp.php
@@ -100,7 +100,7 @@ if ($_POST) {
 		}
 		
 		if (!$input_errors) {	
-			$_POST['remoteip'] = $pconfig['remoteip'] = gen_subnet($_POST['remoteip'], $_POST['pptp_subnet']);
+			$_POST['remoteip'] = gen_subnet($_POST['remoteip'], $_POST['pptp_subnet']);
 			$subnet_start = ip2long($_POST['remoteip']);
 			$subnet_end = ip2long($_POST['remoteip']) + $_POST['n_pptp_units'] - 1;
 						
@@ -374,19 +374,6 @@ function enable_change(enable_over) {
                     Enter the IP address the PPTP server should use on its side 
                     for all clients.</td>
                 </tr>
-                <tr> 
-                  <td width="22%" valign="top" class="vncellreq">Remote address 
-                    range</td>
-                  <td width="78%" class="vtable"> 
-                    <?=$mandfldhtml;?><input name="remoteip" type="text" class="formfld" id="remoteip" size="20" value="<?=htmlspecialchars($pconfig['remoteip']);?>">
-                    / 
-                    <?=$pconfig['pptp_subnet'];?>
-                    <br>
-                    Specify the starting address for the client IP address subnet.<br>
-                    The PPTP server will assign 
-                    <?=$_POST['n_pptp_units'];?>
-                    addresses, starting at the address entered above, to clients.</td>
-                </tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncell">PPTP DNS Servers</td>
                   <td width="78%" class="vtable">