Update config/freeradius2/freeradius.xml

1 files changed, 47 insertions, 48 deletions

diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml
index e55720ac..d6ecd41d 100644
--- a/config/freeradius2/freeradius.xml
+++ b/config/freeradius2/freeradius.xml
@@ -9,7 +9,7 @@
 /*
 	freeradius.xml
 	part of pfSense (http://www.pfSense.com)
-	Copyright (C) 2007 to whom it may belong
+	Copyright (C) 2011 - 2012 to Alexander Wilke <nachtfalkeaw@web.de>
 	All rights reserved.
 
 	Based on m0n0wall (http://m0n0.ch/wall)
@@ -40,9 +40,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 									      */
 /* ========================================================================== */
-]]>
-	
-	</copyright>
+]]>	</copyright>
 	<description><![CDATA[Describe your package here]]></description>
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
@@ -141,7 +139,7 @@
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>Username</fielddescr>
-			<fieldname>username</fieldname>
+			<fieldname>varusersusername</fieldname>
 		</columnitem>
 		<columnitem>
 			<fielddescr>Description</fielddescr>
@@ -149,31 +147,27 @@
 		</columnitem>
 		<columnitem>
 			<fielddescr>IP Address</fielddescr>
-			<fieldname>ip</fieldname>
-		</columnitem>
-		<columnitem>
-			<fielddescr>Subnet Mask</fielddescr>
-			<fieldname>subnetmask</fieldname>
+			<fieldname>varusersframedipaddress</fieldname>
 		</columnitem>
 		<columnitem>
 			<fielddescr>Simultaneous Connections</fielddescr>
-			<fieldname>multiconnect</fieldname>
+			<fieldname>varuserssimultaneousconnect</fieldname>
 		</columnitem>
 		<columnitem>
-			<fielddescr>Expiration Time</fielddescr>
-			<fieldname>expiration</fieldname>
+			<fielddescr>Expiration Date</fielddescr>
+			<fieldname>varusersexpiration</fieldname>
 		</columnitem>
 		<columnitem>
-			<fielddescr>Session Time</fielddescr>
-			<fieldname>sessiontime</fieldname>
+			<fielddescr>Session Timeout</fielddescr>
+			<fieldname>varuserssessiontimeout</fieldname>
 		</columnitem>
 		<columnitem>
-			<fielddescr>Online Time</fielddescr>
-			<fieldname>onlinetime</fieldname>
+			<fielddescr>Possible Login Times</fielddescr>
+			<fieldname>varuserslogintime</fieldname>
 		</columnitem>
 		<columnitem>
 			<fielddescr>VLAN ID</fielddescr>
-			<fieldname>vlanid</fieldname>
+			<fieldname>varusersvlanid</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
 	<fields>
@@ -183,22 +177,23 @@
 		</field>	
 		<field>
 			<fielddescr>Username</fielddescr>
-			<fieldname>username</fieldname>
-			<description><![CDATA[Enter the username.]]></description>
+			<fieldname>varusersusername</fieldname>
+			<description><![CDATA[Enter the username. Whitespace is possible.]]></description>
 			<type>input</type>
 			<required/>
 		</field>
 		<field>
 			<fielddescr>Password</fielddescr>
-			<fieldname>password</fieldname>
+			<fieldname>varuserspassword</fieldname>
 			<description><![CDATA[Enter the password for this username.]]></description>
 			<type>password</type>
 			<required/>
 		</field>
 		<field>
 			<fielddescr>Number of simultaneous connections</fielddescr>
-			<fieldname>multiconnect</fieldname>
-			<description><![CDATA[The maximum of simultaneous connections with this username.]]></description>
+			<fieldname>varuserssimultaneousconnect</fieldname>
+			<description><![CDATA[The maximum of simultaneous connections with this username. (Default: 1)]]></description>
+			<default_value>1</default_value>
 			<required/>
 			<type>input</type>
 		</field>		
@@ -208,7 +203,7 @@
 		</field>
 		<field>
 			<fielddescr>IP Address</fielddescr>
-			<fieldname>ip</fieldname>
+			<fieldname>varusersframedipaddress</fieldname>
 			<description><![CDATA[<b>Framed-IP-Address</b> must be supported by NAS.<br>
 							If you want this user to be assigned a specific IP address from radius, enter the IP address here.<br>
 							Continuous IP address is available with "+" suffix (e.g. 192.168.1.5+). Could be useful for simultaneous connections.<br>
@@ -217,26 +212,26 @@
 		</field>
 		<field>
 			<fielddescr>Subnet Mask</fielddescr>
-			<fieldname>subnetmask</fieldname>			
+			<fieldname>varusersframedipnetmask</fieldname>			
 			<description><![CDATA[<b>Framed-IP-Netmask</b> must be supported by NAS. (e.g. 255.255.255.0)]]></description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Gateway</fielddescr>
-			<fieldname>gateway</fieldname>			
+			<fieldname>varusersframedroute</fieldname>			
 			<description><![CDATA[<b>Framed-Route</b> must be supported by NAS. Format is: Subnet Gateway Metric (e.g. 192.168.10.0 192.168.10.1 1).]]></description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>VLAN ID</fielddescr>
-			<fieldname>vlanid</fieldname>			
-			<description><![CDATA[
-	Enter the VLAN ID (integer from 1-4095) or the VLAN name that this username should be assigned to.<br>
-	Must be supported by the NAS.<br>
-	This setting can be used for a NAS that supports the following RADIUS parameters:<br><br>
-	  Tunnel-Type = VLAN<br>
-	  Tunnel-Medium-Type = IEEE-802<br>
-	  Tunnel-Private-Group-ID = "<b>THIS IS YOUR INPUT</b>"]]></description>
+			<fieldname>varusersvlanid</fieldname>			
+			<description><![CDATA[Enter the VLAN ID (integer from 1-4095) or the VLAN name that this username should be assigned to.<br>
+								Must be supported by the NAS.<br>
+								This setting can be used for a NAS that supports the following RADIUS parameters:<br><br>
+								
+								Tunnel-Type = VLAN<br>
+								Tunnel-Medium-Type = IEEE-802<br>
+								Tunnel-Private-Group-ID = "<b>THIS IS YOUR INPUT</b>"]]></description>
 			<type>input</type>
 		</field>		
 		<field>
@@ -244,20 +239,20 @@
 			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Expiration Time</fielddescr>
-			<fieldname>expiration</fieldname>			
+			<fielddescr>Expiration Date</fielddescr>
+			<fieldname>varusersexpiration</fieldname>			
 			<description><![CDATA[Enter the date when this account should expire. Format is: Mmm dd yyyy (e.g. Jan 01 2012).]]></description>
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Session Time</fielddescr>
-			<fieldname>sessiontime</fieldname>			
+			<fielddescr>Session Timeout</fielddescr>
+			<fieldname>varuserssessiontimeout</fieldname>			
 			<description><![CDATA[Enter the time this user has until relogin in seconds.]]></description>
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Online time</fielddescr>
-			<fieldname>onlinetime</fieldname>			
+			<fielddescr>Possible Login Times</fielddescr>
+			<fieldname>varuserslogintime</fieldname>			
 			<description><![CDATA[Enter the time when this user should have access. If no time is entered it means "always".<br>
 							Every time string contains a day (Mo,Tu,We,Th,Fr,Sa,Su) or all weekdays which is from monday till friday (Wk).<br><br>
 							<b>Wk0855-2305,Sa,Su2230-0230</b><br><br>
@@ -275,25 +270,29 @@
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Additional RADIUS Options</fielddescr>
-			<fieldname>additionaloptions</fieldname>			
+			<fielddescr>Additional RADIUS Options on the TOP of this entry</fielddescr>
+			<fieldname>varuserstopadditionaloptions</fieldname>			
 			<description><![CDATA[This is for experts only and should be treat with care!<br>
-								You may append (after all options from above) custom RADIUS options to this user account (separated by commas).<br>
+								You may append custom RADIUS options to this user account. If the syntax needs it, you have to set quotes and commas.<br>
+								To put a command in a new line use ar vertical bar (|).<br><br>
+								Example: DEFAULT Auth-Type = System<br><br>
 								<b>IMPORTANT:</b> If you don't format this field correctly freeRADIUS will not start because of syntax errors.<br>
 								Verify your changes by checking users file (/usr/local/etc/raddb/users).]]></description>
 			<type>textarea</type>
-			<rows>10</rows>
+			<rows>4</rows>
 			<cols>75</cols>
 		</field>
 		<field>
-			<fielddescr>Output</fielddescr>
-			<fieldname>usersoutput</fieldname>			
+			<fielddescr>Additional RADIUS Options at the END of this user entry</fielddescr>
+			<fieldname>varusersbottomadditionaloptions</fieldname>			
 			<description><![CDATA[This is for experts only and should be treat with care!<br>
-								You may append (after all options from above) custom RADIUS options to this user account (separated by commas).<br>
+								You may append custom RADIUS options to this user account. If the syntax needs it, you have to set quotes and commas.<br>
+								To put a command in a new line use ar vertical bar (|).<br><br>
+								Example: Service-Type == Login-User,|Login-Service == Telnet,|Login-IP-Host == 192.168.1.2<br><br>
 								<b>IMPORTANT:</b> If you don't format this field correctly freeRADIUS will not start because of syntax errors.<br>
 								Verify your changes by checking users file (/usr/local/etc/raddb/users).]]></description>
 			<type>textarea</type>
-			<rows>10</rows>
+			<rows>4</rows>
 			<cols>75</cols>
 		</field>
 	</fields>