diff -Nru zentyal-users-3.1.10/ChangeLog zentyal-users-3.1.11/ChangeLog --- zentyal-users-3.1.10/ChangeLog 2013-09-17 09:18:11.000000000 +0000 +++ zentyal-users-3.1.11/ChangeLog 2013-09-18 12:44:17.000000000 +0000 @@ -1,3 +1,7 @@ +3.1.11 + + Added migration code to be sure that we have all users added as members + of __USERS__ group on OpenLDAP. + + Fixed user creation to make all users belong to __USERS__ group 3.1.10 + Do not crash when deleting a group if LDB object does not exist + Do not try to migrate from 3.0 if module is not configured diff -Nru zentyal-users-3.1.10/debian/changelog zentyal-users-3.1.11/debian/changelog --- zentyal-users-3.1.10/debian/changelog 2013-09-17 09:18:12.000000000 +0000 +++ zentyal-users-3.1.11/debian/changelog 2013-09-18 12:44:18.000000000 +0000 @@ -1,3 +1,9 @@ +zentyal-users (3.1.11) precise; urgency=low + + * New upstream release + + -- José A. Calvo Wed, 18 Sep 2013 14:44:18 +0200 + zentyal-users (3.1.10) precise; urgency=low * New upstream release diff -Nru zentyal-users-3.1.10/src/EBox/Users/Group.pm zentyal-users-3.1.11/src/EBox/Users/Group.pm --- zentyal-users-3.1.10/src/EBox/Users/Group.pm 2013-09-17 09:18:11.000000000 +0000 +++ zentyal-users-3.1.11/src/EBox/Users/Group.pm 2013-09-18 12:44:18.000000000 +0000 @@ -430,7 +430,7 @@ sub save { - my ($self, $ignore_mods) = @_; + my ($self) = @_; shift @_; $self->SUPER::save(@_); diff -Nru zentyal-users-3.1.10/src/EBox/Users/User.pm zentyal-users-3.1.11/src/EBox/Users/User.pm --- zentyal-users-3.1.10/src/EBox/Users/User.pm 2013-09-17 09:18:11.000000000 +0000 +++ zentyal-users-3.1.11/src/EBox/Users/User.pm 2013-09-18 12:44:18.000000000 +0000 @@ -676,6 +676,11 @@ $res->save(); } + $defaultGroup->setIgnoredModules($args{ignoreMods}); + $defaultGroup->setIgnoredSlaves($args{ignoreSlaves}); + $defaultGroup->addMember($res, 1); + $defaultGroup->save(); + # Return the new created user return $res; } diff -Nru zentyal-users-3.1.10/src/EBox/Users.pm zentyal-users-3.1.11/src/EBox/Users.pm --- zentyal-users-3.1.10/src/EBox/Users.pm 2013-09-17 09:18:11.000000000 +0000 +++ zentyal-users-3.1.11/src/EBox/Users.pm 2013-09-18 12:44:17.000000000 +0000 @@ -468,6 +468,14 @@ } } + # Add all users as members of __USERS__ so appear as members on LDAP and not just members because the gid is the one + # for __USERS__. + my $usersGroup = new EBox::Users::Group(gid => DEFAULTGROUP); + for my $user (@{$usersGroup->usersNotIn(1)}) { + $usersGroup->addMember($user, 1); + } + $usersGroup->save(); + $self->_overrideDaemons() if $self->configured(); }