From 247577917639c279993e451b210d38e393630c36 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 21 Apr 2020 17:04:43 +0200
Subject: accel-ppp: unify "authentication mode" XML definition to common
 include file

---
 interface-definitions/include/accel-auth-mode.xml.i | 19 +++++++++++++++++++
 interface-definitions/service_pppoe-server.xml.in   | 20 +-------------------
 interface-definitions/vpn_l2tp.xml.in               | 20 +-------------------
 interface-definitions/vpn_pptp.xml.in               | 20 +-------------------
 interface-definitions/vpn_sstp.xml.in               | 20 +-------------------
 5 files changed, 23 insertions(+), 76 deletions(-)
 create mode 100644 interface-definitions/include/accel-auth-mode.xml.i

diff --git a/interface-definitions/include/accel-auth-mode.xml.i b/interface-definitions/include/accel-auth-mode.xml.i
new file mode 100644
index 000000000..e719112db
--- /dev/null
+++ b/interface-definitions/include/accel-auth-mode.xml.i
@@ -0,0 +1,19 @@
+<leafNode name="mode">
+  <properties>
+    <help>Authentication mode used by this server</help>
+    <valueHelp>
+      <format>local</format>
+      <description>Use local username/password configuration</description>
+    </valueHelp>
+    <valueHelp>
+      <format>radius</format>
+      <description>Use RADIUS server for user autentication</description>
+    </valueHelp>
+    <constraint>
+      <regex>(local|radius)</regex>
+    </constraint>
+    <completionHelp>
+      <list>local radius</list>
+    </completionHelp>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index 0eff18e5c..27669f1c3 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -107,25 +107,7 @@
                   </tagNode>
                 </children>
               </node>
-              <leafNode name="mode">
-                <properties>
-                  <help>Authentication mode for PPPoE Server</help>
-                  <valueHelp>
-                    <format>local</format>
-                    <description>Use local username/password configuration</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>radius</format>
-                    <description>Use a RADIUS server to autenticate users</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>(local|radius)</regex>
-                  </constraint>
-                  <completionHelp>
-                    <list>local radius</list>
-                  </completionHelp>
-                </properties>
-              </leafNode>
+              #include <include/accel-auth-mode.xml.i>
               #include <include/radius-server.xml.i>
               #include <include/accel-radius-additions.xml.in>
               <node name="radius">
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index 278f52ba6..ab0435172 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -294,25 +294,7 @@
                       </completionHelp>
                     </properties>
                   </leafNode>
-                  <leafNode name="mode">
-                    <properties>
-                      <help>Authentication mode for remote access L2TP VPN</help>
-                      <valueHelp>
-                        <format>local</format>
-                        <description>Use local username/password configuration</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>radius</format>
-                        <description>Use a RADIUS server to autenticate users</description>
-                      </valueHelp>
-                      <constraint>
-                        <regex>(local|radius)</regex>
-                      </constraint>
-                      <completionHelp>
-                        <list>local radius</list>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
+                  #include <include/accel-auth-mode.xml.i>
                   <node name="local-users">
                     <properties>
                       <help>Local user authentication for remote access L2TP VPN</help>
diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index 5d8ead2aa..439fd7259 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -162,25 +162,7 @@
                       </completionHelp>
                     </properties>
                   </leafNode>
-                  <leafNode name="mode">
-                    <properties>
-                      <help>Authentication mode for remote access PPTP VPN</help>
-                      <valueHelp>
-                        <format>local</format>
-                        <description>Use local username/password configuration</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>radius</format>
-                        <description>Use a RADIUS server to autenticate users</description>
-                      </valueHelp>
-                      <constraint>
-                        <regex>(local|radius)</regex>
-                      </constraint>
-                      <completionHelp>
-                        <list>local radius</list>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
+                  #include <include/accel-auth-mode.xml.i>
                   <node name="local-users">
                     <properties>
                       <help>Local user authentication for remote access PPTP VPN</help>
diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in
index b5a1b6800..7e4471015 100644
--- a/interface-definitions/vpn_sstp.xml.in
+++ b/interface-definitions/vpn_sstp.xml.in
@@ -66,25 +66,7 @@
                   </tagNode>
                 </children>
               </node>
-              <leafNode name="mode">
-                <properties>
-                  <help>Authentication mode for SSTP Server</help>
-                  <valueHelp>
-                    <format>local</format>
-                    <description>Use local username/password configuration</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>radius</format>
-                    <description>Use a RADIUS server to autenticate users</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>(local|radius)</regex>
-                  </constraint>
-                  <completionHelp>
-                    <list>local radius</list>
-                  </completionHelp>
-                </properties>
-              </leafNode>
+              #include <include/accel-auth-mode.xml.i>
               <leafNode name="protocols">
                 <properties>
                   <help>Authentication protocol for remote access peer SSTP VPN</help>
-- 
cgit v1.2.3