From f9fbda14a2559794999f3391e420c70b31e6a343 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 22 Apr 2020 17:55:30 +0200
Subject: vpn: pptp: T2351: migrate to common name-server, wins-server nodes

---
 interface-definitions/vpn_pptp.xml.in | 64 +++++++----------------------------
 1 file changed, 12 insertions(+), 52 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index 439fd7259..2cafae60f 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -28,60 +28,20 @@
                   </constraint>
                 </properties>
               </leafNode>
-              <node name="dns-servers">
+              <leafNode name="name-server">
                 <properties>
-                  <help>IPv4 Domain Name Service (DNS) server</help>
-                </properties>
-                <children>
-                  <leafNode name="server-1">
-                    <properties>
-                      <help>Primary DNS server</help>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>IPv4 address</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="server-2">
-                    <properties>
-                      <help>Secondary DNS server</help>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>IPv4 address</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <node name="wins-servers">
-                <properties>
-                  <help>Windows Internet Name Service (WINS) server settings</help>
+                  <help>Domain Name Server (DNS) propagated to client</help>
+                  <valueHelp>
+                    <format>ipv4</format>
+                    <description>Domain Name Server (DNS) IPv4 address</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                  </constraint>
+                  <multi/>
                 </properties>
-                <children>
-                  <leafNode name="server-1">
-                    <properties>
-                      <help>Primary WINS server</help>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="server-2">
-                    <properties>
-                      <help>Secondary WINS server</help>
-                    <constraint>
-                      <validator name="ipv4-address"/>
-                    </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
+              </leafNode>
+              #include <include/accel-wins-server.xml.i>
               <node name="client-ip-pool">
                 <properties>
                   <help>Pool of client IP addresses (must be within a /24)</help>
-- 
cgit v1.2.3