Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"

Sheng Yang · Sheng Yang · commit 2d3b3376e37f · 2014-11-14T11:43:03.000-08:00
This reverts commit e1c788c. It breaks Windows 7 client.
diff --git a/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf b/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
@@ -30,5 +30,4 @@ conn L2TP-PSK
         # ----------------------------------------------------------
         # Change 'ignore' to 'add' to enable this configuration.
         #
-        forceencaps=yes
         auto=add

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,4 @@ conn L2TP-PSK`
`30`	`30`	`# ----------------------------------------------------------`
`31`	`31`	`# Change 'ignore' to 'add' to enable this configuration.`
`32`	`32`	`#`
`33`		`- forceencaps=yes`
`34`	`33`	`auto=add`