* Sat Apr 06 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme

- drop rssh group reverting  patch of 11753 [SME: 12510]
This commit is contained in:
Jean-Philippe Pialasse 2024-04-06 17:02:43 -04:00
parent e2f6be5be1
commit c61ecb51a0
2 changed files with 4 additions and 5 deletions

View File

@ -74,7 +74,6 @@ foreach (qw/Users Groups Computers/) {
$data->{"cn=nobody,$groupou,$basedn"}->{objectclass} = [ qw/posixGroup/ ]; $data->{"cn=nobody,$groupou,$basedn"}->{objectclass} = [ qw/posixGroup/ ];
$data->{"uid=www,$userou,$basedn"}->{objectclass} = [ qw/account/ ]; $data->{"uid=www,$userou,$basedn"}->{objectclass} = [ qw/account/ ];
$data->{"cn=www,$groupou,$basedn"} = { objectclass => [ qw/posixGroup/ ], memberuid => [ qw/admin/ ] }; $data->{"cn=www,$groupou,$basedn"} = { objectclass => [ qw/posixGroup/ ], memberuid => [ qw/admin/ ] };
$data->{"cn=rsshusers,$groupou,$basedn"}->{objectclass} = [ qw/posixGroup/ ];
$data->{"cn=shared,$groupou,$basedn"} = { $data->{"cn=shared,$groupou,$basedn"} = {
objectclass => [ qw/posixGroup mailboxRelatedObject/ ], objectclass => [ qw/posixGroup mailboxRelatedObject/ ],
mail => "everyone\@$domain", mail => "everyone\@$domain",
@ -108,9 +107,6 @@ foreach my $acct ($a->get('admin'), $a->users, $a->groups, $a->ibays, $a->get_al
# users/ibays need to be a member of shared # users/ibays need to be a member of shared
push @{$data->{"cn=shared,$groupou,$basedn"}->{memberuid}}, $key if $type =~ /^(user|ibay)$/ || $key eq 'admin'; push @{$data->{"cn=shared,$groupou,$basedn"}->{memberuid}}, $key if $type =~ /^(user|ibay)$/ || $key eq 'admin';
# users need to be a member of rsshusers if their shell is /usr/bin/rssh
push @{$data->{"cn=rsshusers,$groupou,$basedn"}->{memberuid}}, $key if ($type =~ /^(user)$/ || $key eq 'admin') && (($acct->prop('Shell') || '/usr/bin/rssh') eq '/usr/bin/rssh');
if ($auth ne 'enabled') { if ($auth ne 'enabled') {
# Allow removal of shadow properties # Allow removal of shadow properties
push @{$data->{$dn}->{_delete}->{objectclass}}, 'shadowAccount'; push @{$data->{$dn}->{_delete}->{objectclass}}, 'shadowAccount';

View File

@ -4,7 +4,7 @@ Summary: smeserver server and gateway - LDAP module
%define name smeserver-ldap %define name smeserver-ldap
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 4 %define release 5
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -29,6 +29,9 @@ Provides: e-smith-ldap
smeserver server and gateway software - LDAP module. smeserver server and gateway software - LDAP module.
%changelog %changelog
* Sat Apr 06 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
- drop rssh group reverting patch of 11753 [SME: 12510]
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-4.sme * Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-4.sme
- Update createlinks to create smeserver-package-update event[SME: 12579] - Update createlinks to create smeserver-package-update event[SME: 12579]