Repository: cloudstack
Updated Branches:
  refs/heads/4.5 3609f6044 -> 2d3b3376e


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

This reverts commit e1c788ca3c69a8c8c2041c7b106f76fa49332888.

It breaks Windows 7 client.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2d3b3376
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2d3b3376
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2d3b3376

Branch: refs/heads/4.5
Commit: 2d3b3376e37faeec3ed62a58750819dc7630260c
Parents: 3609f60
Author: Sheng Yang <[email protected]>
Authored: Fri Nov 14 11:43:03 2014 -0800
Committer: Sheng Yang <[email protected]>
Committed: Fri Nov 14 11:43:03 2014 -0800

----------------------------------------------------------------------
 systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d3b3376/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf 
b/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
index 1cdd69d..7459e25 100644
--- 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

Reply via email to