Merge pull request #4 from rhafer/master-bnc798788

bnc#798788 - Do not duplicate SyncRepl ACL
yast · Mar 22, 2013 · 70f965a · 70f965a
2 parents 71218a7 + c89c9e8
commit 70f965a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/package/yast2-ldap-server.changes b/package/yast2-ldap-server.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Mar  1 11:21:39 UTC 2013 - rhafer@suse.com
+
+- Opening the Access Control UI could create duplicated syncrepl
+  ACLs (bnc#798788)
+
+-------------------------------------------------------------------
+Fri Mar  1 06:12:51 UTC 2013 - coolo@suse.com
+
+- update license to new format
+
 -------------------------------------------------------------------
 Thu Mar 29 10:21:20 CEST 2012 - jsuchome@suse.cz
 

diff --git a/src/LdapServer.pm b/src/LdapServer.pm
@@ -2088,7 +2088,6 @@ sub ChangeDatabaseAcl
         if ( $found ) 
         {
             # push syncrepl acl on top
-            push @{$acllist_sorted}, $syncacl;
             $acllist = [ $syncacl ];
             push @{$acllist}, @{$acllist_sorted};
         }

diff --git a/yast2-ldap-server.spec.in b/yast2-ldap-server.spec.in
@@ -2,7 +2,7 @@
 
 @HEADER@
 Group:	System/YaST
-License:        GPL-2.0+ ; MIT
+License:        GPL-2.0+ and MIT
 BuildRequires:	boost-devel gcc-c++ libldapcpp-devel libtool perl-Digest-SHA1 perl-gettext perl-X500-DN pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-users
 Requires:	acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings