summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-30 15:53:10 +0000
committerErmal <eri@pfsense.org>2011-08-30 16:11:22 +0000
commitfcf07bb76fb58556bee76f4e3898ee769b2785d5 (patch)
tree16046638310dc2c84d4e080a23dbd35f8215ab32
parent1f2f60240c8829c64ad786eb33ecc6ba0cd1d5a2 (diff)
downloadpfsense-fcf07bb76fb58556bee76f4e3898ee769b2785d5.zip
pfsense-fcf07bb76fb58556bee76f4e3898ee769b2785d5.tar.gz
Fix several issues in pppoe code and remove duplicated code.
-rw-r--r--etc/inc/vpn.inc4
-rwxr-xr-xusr/local/www/vpn_pppoe_edit.php3
2 files changed, 3 insertions, 4 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 4baa9b0..971c920 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1252,7 +1252,7 @@ function vpn_pppoe_configure(&$pppoecfg) {
$clientip = long2ip32(ip2long($pppoecfg['remoteip']) + $i);
- if (isset ($pppoecfg['radius']['radiusissueips']) && isset ($pppoecfg['radius']['server']['enable'])) {
+ if (isset($pppoecfg['radius']['radiusissueips']) && isset($pppoecfg['radius']['server']['enable'])) {
$isssue_ip_type = "set ipcp ranges {$pppoecfg['localip']}/32 0.0.0.0/0";
} else {
$isssue_ip_type = "set ipcp ranges {$pppoecfg['localip']}/32 {$clientip}/32";
@@ -1320,7 +1320,7 @@ EOD;
if (isset($pppoecfg['radius']['server']['acctport']))
$radiusacctport = $pppoecfg['radius']['server']['acctport'];
$mpdconf .=<<<EOD
- set radius server {$pppoecfg['radius']['server']['ip']} "{$pppoecfg['radius']['server']['secret']} {$radiusport} {$radiusacctport}"
+ set radius server {$pppoecfg['radius']['server']['ip']} "{$pppoecfg['radius']['server']['secret']}" {$radiusport} {$radiusacctport}
set radius retries 3
set radius timeout 10
set auth enable radius-auth
diff --git a/usr/local/www/vpn_pppoe_edit.php b/usr/local/www/vpn_pppoe_edit.php
index 6c94797..92d617f 100755
--- a/usr/local/www/vpn_pppoe_edit.php
+++ b/usr/local/www/vpn_pppoe_edit.php
@@ -95,7 +95,6 @@ if (isset($id) && $a_pppoes[$id]) {
$pconfig['radiusserver2acctport'] = $pppoecfg['radius']['server2']['acctport'];
$pconfig['radiussecret2'] = $pppoecfg['radius']['server2']['secret2'];
}
- $pconfig['radiusissueips'] = isset($pppoecfg['radius']['radiusissueips']);
$pconfig['radius_nasip'] = $pppoecfg['radius']['nasip'];
$pconfig['radius_acct_update'] = $pppoecfg['radius']['acct_update'];
}
@@ -170,7 +169,7 @@ if ($_POST) {
$pppoecfg['radius']['server']['port'] = $_POST['radiusserverport'];
$pppoecfg['radius']['server']['acctport'] = $_POST['radiusserveracctport'];
}
- if ($_POST['radiusserver']) {
+ if ($_POST['radiusserver2']) {
$pppoecfg['radius']['server2'] = array();
$pppoecfg['radius']['server2']['ip'] = $_POST['radiusserver2'];
OpenPOWER on IntegriCloud