ipsec fixes for 6.0

zentyal · Nov 12, 2018 · 816b47a · 816b47a
1 parent 95653d0
commit 816b47a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/main/ipsec/ChangeLog b/main/ipsec/ChangeLog
@@ -1,5 +1,6 @@
 6.0
-	+ Set version to 6.0
+	+ Remove unrecognized crtscts and lock options in xl2tpd conf
+	+ Fix call to deprecated securityGroups method
 5.1
 	+ Adapt for Ubuntu 16.04, integrating libreswan instead of openswan
 3.5.2

diff --git a/main/ipsec/src/EBox/IPsec/Model/Users.pm b/main/ipsec/src/EBox/IPsec/Model/Users.pm
@@ -103,7 +103,7 @@ sub _populateGroups
     }
 
     my @securityGroups;
-    foreach my $group (@{$usersMod->ldap()->securityGroups()}) {
+    foreach my $group (@{$usersMod->securityGroups()}) {
         my $name = $group->name();
         push (@securityGroups, {
             value => $name,

diff --git a/main/ipsec/stubs/options.xl2tpd.mas b/main/ipsec/stubs/options.xl2tpd.mas
@@ -16,13 +16,11 @@ ms-wins <% $tunnel->{'wins_server'} %>
 %   }
 noccp
 auth
-crtscts
 idle 1800
 mtu 1410
 mru 1410
 nodefaultroute
 debug
-lock
 proxyarp
 connect-delay 5000
 %   if ($group) {