From 8df04c75d1210a898154c022623c6157d4a4a96b Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Tue, 16 Jun 2020 09:37:51 +0200
Subject: [PATCH] net/freeradius: fix Login-Time validation (#1887)

* Update User.xml

* Update Makefile

* Update pkg-descr
---
 net/freeradius/Makefile                                       | 2 +-
 net/freeradius/pkg-descr                                      | 4 ++++
 .../src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 2d667aa9e..2178cd874 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		freeradius
-PLUGIN_VERSION=		1.9.6
+PLUGIN_VERSION=		1.9.7
 PLUGIN_COMMENT=		RADIUS Authentication, Authorization and Accounting Server
 PLUGIN_DEPENDS=		freeradius3
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/freeradius/pkg-descr b/net/freeradius/pkg-descr
index efb440687..bedbd33da 100644
--- a/net/freeradius/pkg-descr
+++ b/net/freeradius/pkg-descr
@@ -15,6 +15,10 @@ The server is fast, feature-rich, modular, and scalable.
 Plugin Changelog
 ================
 
+1.9.7
+
+* Fix Login-Time validation
+
 1.9.6
 
 * Fix log not properly parsed
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
index c98c2e315..c2432ab0b 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
@@ -42,7 +42,7 @@
                 </vlan>
                 <logintime type="TextField">
                     <Required>N</Required>
-                    <mask>/^([0-9a-zA-Z\-]){1,128}$/u</mask>
+                    <mask>/^([0-9a-zA-Z\-\,]){1,128}$/u</mask>
                 </logintime>
                 <simuse type="IntegerField">
                     <Required>N</Required>