From 52e868e1abfecf00aafc359adefcd3ca7c57b8bd Mon Sep 17 00:00:00 2001
From: aapostoliuk <a.apostoliuk@vyos.io>
Date: Wed, 24 Jan 2024 15:50:01 +0200
Subject: T5971: Rewritten ppp options in accel-ppp services

Rewritten 'ppp-options' to the same view in all accel-ppp services.
Adding IPv6 support to PPTP.

(cherry picked from commit d9e57fe65dd538c6ea80637f4f6f23cf11dc583d)
---
 interface-definitions/vpn_pptp.xml.in | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

(limited to 'interface-definitions/vpn_pptp.xml.in')

diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index ec622b5d0..d23086c02 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -27,7 +27,7 @@
                 </properties>
               </leafNode>
               #include <include/accel-ppp/gateway-address.xml.i>
-              #include <include/name-server-ipv4.xml.i>
+              #include <include/name-server-ipv4-ipv6.xml.i>
               #include <include/accel-ppp/wins-server.xml.i>
               #include <include/accel-ppp/client-ip-pool.xml.i>
               <node name="authentication">
@@ -63,30 +63,6 @@
                     </properties>
                     <defaultValue>mschap-v2</defaultValue>
                   </leafNode>
-                  <leafNode name="mppe">
-                    <properties>
-                      <help>Specifies mppe negotioation preference. (default require mppe 128-bit stateless</help>
-                      <valueHelp>
-                        <format>deny</format>
-                        <description>deny mppe</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>prefer</format>
-                        <description>ask client for mppe, if it rejects do not fail</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>require</format>
-                        <description>ask client for mppe, if it rejects drop connection</description>
-                      </valueHelp>
-                      <constraint>
-                        <regex>(deny|prefer|require)</regex>
-                      </constraint>
-                      <completionHelp>
-                        <list>deny prefer require</list>
-                      </completionHelp>
-                    </properties>
-                    <defaultValue>prefer</defaultValue>
-                  </leafNode>
                   #include <include/accel-ppp/auth-mode.xml.i>
                   <node name="local-users">
                     <properties>
@@ -134,7 +110,9 @@
                 </children>
               </node>
               #include <include/accel-ppp/default-pool.xml.i>
+              #include <include/accel-ppp/client-ipv6-pool.xml.i>
               #include <include/accel-ppp/default-ipv6-pool.xml.i>
+              #include <include/accel-ppp/ppp-options.xml.i>
             </children>
           </node>
         </children>
-- 
cgit v1.2.3