diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2024-02-02 10:51:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-02 10:51:11 +0200 |
| commit | cb702bbe61436286c2ac9400ee4e09c4b5ac397c (patch) | |
| tree | a2c5e1a276af9fa1af24d200e49355995479fbe6 /interface-definitions/vpn_pptp.xml.in | |
| parent | a092d507aefcf2c3588a7bcb7496c1c0cbfa7fe8 (diff) | |
| parent | 52e868e1abfecf00aafc359adefcd3ca7c57b8bd (diff) | |
| download | vyos-1x-cb702bbe61436286c2ac9400ee4e09c4b5ac397c.tar.gz vyos-1x-cb702bbe61436286c2ac9400ee4e09c4b5ac397c.zip | |
Merge pull request #2928 from vyos/mergify/bp/sagitta/pr-2891
T5971: Rewritten ppp options in accel-ppp services (backport #2891)
Diffstat (limited to 'interface-definitions/vpn_pptp.xml.in')
| -rw-r--r-- | interface-definitions/vpn_pptp.xml.in | 28 |
1 files changed, 3 insertions, 25 deletions
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> |