aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/freeradius.inc12
-rw-r--r--config/squid/squid.xml1
-rw-r--r--config/squid3/squid.xml1
3 files changed, 13 insertions, 1 deletions
diff --git a/config/freeradius.inc b/config/freeradius.inc
index b7e4208c..4a250121 100644
--- a/config/freeradius.inc
+++ b/config/freeradius.inc
@@ -450,7 +450,9 @@ function freeradius_users_resync() {
$username = $user['username'];
$password = $user['password'];
$multiconnect = $user['multiconnect'];
- $ip = $user['ip'];
+ $ip = $user['ip'];
+ $subnetmask = $user['subnetmask'];
+ $gateway = $user['gateway'];
$userexpiration=$user['expiration'];
$sessiontime=$user['sessiontime'];
$onlinetime=$user['onlinetime'];
@@ -471,6 +473,14 @@ function freeradius_users_resync() {
if ($atrib <> '') { $atrib .=","; }
$atrib .="\r\n\tFramed-IP-Address = $ip";
}
+ if ($subnetmask <> '') {
+ if ($atrib <> '') { $atrib .=","; }
+ $atrib .="\r\n\tFramed-IP-Netmask = $subnetmask";
+ }
+ if ($gateway <> '') {
+ if ($atrib <> '') { $atrib .=","; }
+ $atrib .="\r\n\tFramed-Routing = $gateway";
+ }
if ($sessiontime <> '') {
if ($atrib <> '') { $atrib .=","; }
$atrib .="\r\n\tSession-Timeout := $sessiontime";
diff --git a/config/squid/squid.xml b/config/squid/squid.xml
index 4ce0af0f..9cd0e3b3 100644
--- a/config/squid/squid.xml
+++ b/config/squid/squid.xml
@@ -166,6 +166,7 @@
<fieldname>transparent_proxy</fieldname>
<description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description>
<type>checkbox</type>
+ <enablefields>private_subnet_proxy_off</enablefields>
<required/>
</field>
<field>
diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml
index 414ac0ff..f07793bb 100644
--- a/config/squid3/squid.xml
+++ b/config/squid3/squid.xml
@@ -166,6 +166,7 @@
<fieldname>transparent_proxy</fieldname>
<description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description>
<type>checkbox</type>
+ <enablefields>private_subnet_proxy_off</enablefields>
<required/>
</field>
<field>