From 177d5e9beba95aa996fa991d3511c44d4660713d Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 24 Sep 2015 20:53:00 +0200
Subject: [PATCH] (new captive portal, work in progress) add authenticator
 selector to model and form

---
 .../OPNsense/CaptivePortal/forms/dialogZone.xml           | 8 ++++++++
 .../app/models/OPNsense/CaptivePortal/CaptivePortal.xml   | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
index 35047fcb7..b554322f7 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
@@ -19,6 +19,14 @@
         <help><![CDATA[Select the interface(s) to enable for captive portal.]]></help>
         <hint>Type or select interface.</hint>
     </field>
+    <field>
+        <id>zone.authservers</id>
+        <label>authenticate using</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <help><![CDATA[Select authentication methods to use, leave empty for no authentication needed.]]></help>
+        <hint>Type or select server.</hint>
+    </field>
     <field>
         <id>zone.description</id>
         <label>description</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
index a7b2ee6a7..718f60ce6 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
@@ -25,6 +25,11 @@
                         <ipaddr>/^((?!dhcp).)*$/</ipaddr>
                     </filters>
                 </interfaces>
+                <authservers type="AuthenticationServerField">
+                    <Required>Y</Required>
+                    <multiple>Y</multiple>
+                    <default>Local Database</default>
+                </authservers>
                 <description type="TextField">
                     <Required>Y</Required>
                     <mask>/^([\t\n\v\f\r 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>