Merge branch 'master' of https://github.com/bsdperimeter/pfsense-packages

1 files changed, 25 insertions, 21 deletions

diff --git a/config/freeradius2/freeradiussettings.xml b/config/freeradius2/freeradiussettings.xml
index e918c249..a0b08ab4 100755..100644
--- a/config/freeradius2/freeradiussettings.xml
+++ b/config/freeradius2/freeradiussettings.xml
@@ -42,7 +42,7 @@
 /* ========================================================================== */
 		]]>
 	</copyright>
-	<description>Describe your package here</description>
+	<description><![CDATA[Describe your package here]]></description>
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>freeradiussettings</name>
@@ -68,6 +68,10 @@
 			<url>/pkg_edit.php?xml=freeradiussettings.xml&amp;id=0</url>
 			<active/>
 		</tab>
+		<tab>
+			<text>EAP</text>
+			<url>/pkg_edit.php?xml=freeradiuseapconf.xml&amp;id=0</url>
+		</tab>
 	</tabs>
 	<fields>
 		<field>
@@ -77,28 +81,28 @@
 		<field>
 			<fielddescr>Maximum Requests Server</fielddescr>
 			<fieldname>varsettingsmaxrequests</fieldname>
-			<description>The maximum number of requests the server could handle at a time until "Cleanup Delay" deletes them. Useful range 256 * NAS. If it is set to low it will make the server busy. A higher value is better (but increased RAM usage) but it shouldn't be higher than 1000 * NAS. (Default: 1024)</description>
+			<description><![CDATA[The maximum number of requests the server could handle at a time until "Cleanup Delay" deletes them. Useful range 256 * NAS. If it is set to low it will make the server busy. A higher value is better (but increased RAM usage) but it shouldn't be higher than 1000 * NAS. (Default: 1024)]]></description>
 			<type>input</type>
 			<default_value>1024</default_value>
 		</field>
 		<field>
 			<fielddescr>Max Request Timeout</fielddescr>
 			<fieldname>varsettingsmaxrequesttime</fieldname>
-			<description>The maximum time to handle a request in seconds. (Default: 30)</description>
+			<description><![CDATA[The maximum time to handle a request in seconds. (Default: 30)]]></description>
 			<type>input</type>
 			<default_value>30</default_value>
 		</field>
 		<field>
 			<fielddescr>Cleanup Delay</fielddescr>
 			<fieldname>varsettingscleanupdelay</fieldname>
-			<description>The time to wait before cleaning up a reply which was sent to the NAS in seconds. (Default: 5)</description>
+			<description><![CDATA[The time to wait before cleaning up a reply which was sent to the NAS in seconds. (Default: 5)]]></description>
 			<type>input</type>
 			<default_value>5</default_value>
 		</field>
 		<field>
 			<fielddescr>NAS Hostname Lookup</fielddescr>
 			<fieldname>varsettingshostnamelookups</fieldname>
-			<description>Log the names of NAS instead of IP addresses. Turning this on can result in lock ups of the RADIUS Server. (Default: no)</description>
+			<description><![CDATA[Log the names of NAS instead of IP addresses. Turning this on can result in lock ups of the RADIUS Server. (Default: no)]]></description>
 			<type>select</type>
 			<default_value>no</default_value>
 					<options>
@@ -109,7 +113,7 @@
 		<field>
 			<fielddescr>Allow Core Dumps</fielddescr>
 			<fieldname>varsettingsallowcoredumps</fieldname>
-			<description>Only turn this on if you need to debug the RADIUS server! (Default: no)</description>
+			<description><![CDATA[Only turn this on if you need to debug the RADIUS server! (Default: no)]]></description>
 			<type>select</type>
 			<default_value>no</default_value>
 					<options>
@@ -120,7 +124,7 @@
 		<field>
 			<fielddescr>Regular Expressions</fielddescr>
 			<fieldname>varsettingsregularexpressions</fieldname>
-			<description>Allows regular expressions. (Default: yes)</description>
+			<description><![CDATA[Allows regular expressions. (Default: yes)]]></description>
 			<type>select</type>
 			<default_value>yes</default_value>
 					<options>
@@ -131,7 +135,7 @@
 		<field>
 			<fielddescr>Extended Expressions</fielddescr>
 			<fieldname>varsettingsextendedexpressions</fieldname>
-			<description>Allows extended expressions. (Default: yes)</description>
+			<description><![CDATA[Allows extended expressions. (Default: yes)]]></description>
 			<type>select</type>
 			<default_value>yes</default_value>
 					<options>
@@ -146,7 +150,7 @@
 		<field>
 			<fielddescr>Logging Destination of RADIUS</fielddescr>
 			<fieldname>varsettingslogdir</fieldname>
-			<description>Choose the destination where freeRADIUS should log. Logging must be enabled.(Default: radius.log)</description>
+			<description><![CDATA[Choose the destination where freeRADIUS should log. Logging must be enabled.(Default: radius.log)]]></description>
 			<type>select</type>
 			<default_value>files</default_value>
 					<options>
@@ -159,7 +163,7 @@
 		<field>
 			<fielddescr>RADIUS Logging</fielddescr>
 			<fieldname>varsettingsauth</fieldname>
-			<description>Choose if you want to enable logging. (Default: Disabled)</description>
+			<description><![CDATA[Choose if you want to enable logging. (Default: Disabled)]]></description>
 			<type>select</type>
 			<default_value>no</default_value>
 					<options>
@@ -170,7 +174,7 @@
 		<field>
 			<fielddescr>Log Bad Authentication Attempts</fielddescr>
 			<fieldname>varsettingsauthbadpass</fieldname>
-			<description>Choose if you want to log bad authentication attempts. Logging must be enabled. (Default: no)</description>
+			<description><![CDATA[Choose if you want to log bad authentication attempts. Logging must be enabled. (Default: no)]]></description>
 			<type>select</type>
 			<default_value>no</default_value>
 					<options>
@@ -181,7 +185,7 @@
 		<field>
 			<fielddescr>Log good authentication attempts?</fielddescr>
 			<fieldname>varsettingsauthgoodpass</fieldname>
-			<description>Choose if you want to log good authentication attempts. Logging must be enabled. (Default: no)</description>
+			<description><![CDATA[Choose if you want to log good authentication attempts. Logging must be enabled. (Default: no)]]></description>
 			<type>select</type>
 			<default_value>no</default_value>
 					<options>
@@ -192,7 +196,7 @@
 		<field>
 			<fielddescr>Log Stripped Names</fielddescr>
 			<fieldname>varsettingsstrippednames</fieldname>
-			<description>Choose if you want to log the full User-Name attribute as it was found in the request. Logging must be enabled. (Default: no)</description>
+			<description><![CDATA[Choose if you want to log the full User-Name attribute as it was found in the request. Logging must be enabled. (Default: no)]]></description>
 			<type>select</type>
 			<default_value>no</default_value>
 					<options>
@@ -207,14 +211,14 @@
 		<field>
 			<fielddescr>Maximum Number of Attributes</fielddescr>
 			<fieldname>varsettingsmaxattributes</fieldname>
-			<description>The maximum number of attributes permitted in a RADIUS packet. Packets which have more than this number of attributes in them will be dropped. (Default: 200)</description>
+			<description><![CDATA[The maximum number of attributes permitted in a RADIUS packet. Packets which have more than this number of attributes in them will be dropped. (Default: 200)]]></description>
 			<type>input</type>
 			<default_value>200</default_value>
 		</field>
 		<field>
 			<fielddescr>Access-Reject Delay</fielddescr>
 			<fieldname>varsettingsrejectdelay</fieldname>
-			<description>When sending an Access-Reject it can be delayed for a few seconds. This may help slow down a DoS attack. It also helps to slow down people trying to brute-force crack a users password. (Default: 1)(Immediately: 0)</description>
+			<description><![CDATA[When sending an Access-Reject it can be delayed for a few seconds. This may help slow down a DoS attack. It also helps to slow down people trying to brute-force crack a users password. (Default: 1)(Immediately: 0)]]></description>
 			<type>input</type>
 			<default_value>1</default_value>
 		</field>
@@ -225,42 +229,42 @@
 		<field>
 			<fielddescr>Number of Threads After Start</fielddescr>
 			<fieldname>varsettingsstartservers</fieldname>
-			<description>The thread pool is a long-lived group of threads which take turns (round-robin) handling any incoming requests. (Default: 5)</description>
+			<description><![CDATA[The thread pool is a long-lived group of threads which take turns (round-robin) handling any incoming requests. (Default: 5)]]></description>
 			<type>input</type>
 			<default_value>5</default_value>
 		</field>
 		<field>
 			<fielddescr>Maximum Number of Threads</fielddescr>
 			<fieldname>varsettingsmaxservers</fieldname>
-			<description>If this limit is ever reached, clients will be locked out so it should not be set to low. (Default: 32)</description>
+			<description><![CDATA[If this limit is ever reached, clients will be locked out so it should not be set to low. (Default: 32)]]></description>
 			<type>input</type>
 			<default_value>32</default_value>
 		</field>
 		<field>
 			<fielddescr>Min Spare Servers</fielddescr>
 			<fieldname>varsettingsminspareservers</fieldname>
-			<description>This dynamically adjusts the "Number of Threads After Start". If the RADIUS server has to handle MANY requests and LESS than "Min Spare Servers" are left than the RADIUS server will INCREASE the number of running threads. (Default: 3)</description>
+			<description><![CDATA[This dynamically adjusts the "Number of Threads After Start". If the RADIUS server has to handle MANY requests and LESS than "Min Spare Servers" are left than the RADIUS server will INCREASE the number of running threads. (Default: 3)]]></description>
 			<type>input</type>
 			<default_value>3</default_value>
 		</field>
 		<field>
 			<fielddescr>Max Spare Servers</fielddescr>
 			<fieldname>varsettingsmaxspareservers</fieldname>
-			<description>This dynamically adjusts the "Number of Threads After Start". If the RADIUS server has to handle FEW requests and MORE than "Max Spare Servers" are left than the RADIUS server will DECREASE the number of running threads. (Default: 10)</description>
+			<description><![CDATA[This dynamically adjusts the "Number of Threads After Start". If the RADIUS server has to handle FEW requests and MORE than "Max Spare Servers" are left than the RADIUS server will DECREASE the number of running threads. (Default: 10)]]></description>
 			<type>input</type>
 			<default_value>10</default_value>
 		</field>
 		<field>
 			<fielddescr>Server Packet Queue Size</fielddescr>
 			<fieldname>varsettingsmaxqueuesize</fieldname>
-			<description>This is the queue size where the server stores packets before processing them. (Default: 65536)</description>
+			<description><![CDATA[This is the queue size where the server stores packets before processing them. (Default: 65536)]]></description>
 			<type>input</type>
 			<default_value>65536</default_value>
 		</field>
 		<field>
 			<fielddescr>Maximum Requests per Server</fielddescr>
 			<fieldname>varsettingsmaxrequestsperserver</fieldname>
-			<description>You should only change this if you encounter memory leaks while running RADIUS. (Default: 0)</description>
+			<description><![CDATA[You should only change this if you encounter memory leaks while running RADIUS. (Default: 0)]]></description>
 			<type>input</type>
 			<default_value>0</default_value>
 		</field>