From d96f07f5c9355d136b44c3177add21cc9d98e003 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 1 Feb 2018 09:48:42 +0100
Subject: [PATCH] net/freeradius: merge version 1.5.2 from master

---
 net/freeradius/Makefile                                       | 2 +-
 .../mvc/app/controllers/OPNsense/Freeradius/forms/eap.xml     | 4 ++--
 .../opnsense/mvc/app/views/OPNsense/Freeradius/client.volt    | 2 +-
 .../src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt   | 2 +-
 .../opnsense/mvc/app/views/OPNsense/Freeradius/general.volt   | 2 +-
 .../src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt  | 2 +-
 .../src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt  | 2 +-
 .../opnsense/service/templates/OPNsense/Freeradius/radiusd    | 1 -
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 2bfb15184..fd02ca9ad 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		freeradius
-PLUGIN_VERSION=		1.5.1
+PLUGIN_VERSION=		1.5.2
 PLUGIN_COMMENT=		RADIUS Authentication, Authorization and Accounting Server
 PLUGIN_DEPENDS=		freeradius3
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/eap.xml b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/eap.xml
index 077d5316d..84905ac07 100644
--- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/eap.xml
+++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/eap.xml
@@ -7,9 +7,9 @@
     </field>
     <field>
         <id>eap.enable_client_cert</id>
-        <label>Enable Client Certficate Authentication</label>
+        <label>Validate Certificates</label>
         <type>checkbox</type>
-        <help>This will activate certificate based authentication. Please choose CA and Certificate below and do not forget to roll out certificates to the clients.</help>
+        <help>This will activate certificate based authentication (EAP-TLS) and validation (EAP-TTLS). Please choose CA and Certificate below and do not forget to roll out certificates to the clients.</help>
     </field>
     <field>
         <id>eap.ca</id>
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/client.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/client.volt
index e20497981..76d3c57c7 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/client.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/client.volt
@@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #}
 
-<script type="text/javascript">
+<script>
 
     $( document ).ready(function() {
         /*************************************************************************************************************
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt
index 2581b0184..f4a57095f 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/eap.volt
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
     </div>
 </div>
 
-<script type="text/javascript">
+<script>
     $( document ).ready(function () {
         var data_get_map = {'frm_eap_settings':"/api/freeradius/eap/get"};
         mapDataToFormUI(data_get_map).done(function (data) {
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/general.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/general.volt
index 3f3e64fbf..c1c7f3ede 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/general.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/general.volt
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
     </div>
 </div>
 
-<script type="text/javascript">
+<script>
     $( document ).ready(function () {
         var data_get_map = {'frm_general_settings':"/api/freeradius/general/get"};
         mapDataToFormUI(data_get_map).done(function (data) {
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt
index 777801049..b74d06c31 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/ldap.volt
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
     </div>
 </div>
 
-<script type="text/javascript">
+<script>
     $( document ).ready(function () {
         var data_get_map = {'frm_ldap_settings':"/api/freeradius/ldap/get"};
         mapDataToFormUI(data_get_map).done(function (data) {
diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt
index cb616dd54..e6fc1d67a 100644
--- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt
+++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/user.volt
@@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #}
 
-<script type="text/javascript">
+<script>
 
     $( document ).ready(function() {
         /*************************************************************************************************************
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd
index e65dfab62..d5c05a893 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd
@@ -1,5 +1,4 @@
 {% if helpers.exists('OPNsense.freeradius.general.enabled') and OPNsense.freeradius.general.enabled == '1' %}
-radiusd_opnsense_bootup_run="/usr/local/opnsense/scripts/Freeradius/setup.sh"
 radiusd_var_script="/usr/local/opnsense/scripts/Freeradius/setup.sh"
 radiusd_enable="YES"
 {% else %}