diff options
| author | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
| commit | d9e2c1714bc55f546702a8660f62e8cff2716aa4 (patch) | |
| tree | 069b2f5369ad4bf9c7e60806b47f5dd42e409c78 /usr/local/www/vpn_pptp.php | |
| parent | 30ade8461e65922c8d8a22d3b9ba5b07bb2912e0 (diff) | |
| parent | c0ed686f9441b7019722954020057b23fe2f6603 (diff) | |
| download | pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.zip pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
usr/local/www/interfaces.php
Not sure why there was a conflict since the last change to this file was May 20.
Diffstat (limited to 'usr/local/www/vpn_pptp.php')
| -rwxr-xr-x | usr/local/www/vpn_pptp.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index 5aae209..1c88670 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -99,11 +99,11 @@ if ($_POST) { } if (!$input_errors) { - $subnet_start = ip2long($_POST['remoteip']); - $subnet_end = ip2long($_POST['remoteip']) + $_POST['n_pptp_units'] - 1; + $subnet_start = ip2ulong($_POST['remoteip']); + $subnet_end = ip2ulong($_POST['remoteip']) + $_POST['n_pptp_units'] - 1; - if ((ip2long($_POST['localip']) >= $subnet_start) && - (ip2long($_POST['localip']) <= $subnet_end)) { + if ((ip2ulong($_POST['localip']) >= $subnet_start) && + (ip2ulong($_POST['localip']) <= $subnet_end)) { $input_errors[] = "The specified server address lies in the remote subnet."; } // TODO: Should this check be for any local IP address? |
