smeserver/smeserver-base
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Dec 31 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-19.sme

Browse Source 
- fix www removed from shared on group creation [SME: 12848]
This commit is contained in:
Jean-Philippe Pialasse 2024-12-31 03:29:03 -05:00
parent 3e5231bf84
commit 5b938b2987
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
root/etc/e-smith/events/actions/group-create-unix
View File

@ -137,7 +137,9 @@ foreach my $member (@groupMembers)
# new group to the list. Finally sort, join and run the usermod # new group to the list. Finally sort, join and run the usermod
# function to update the group list for this member. # function to update the group list for this member.
my $cmd = "/usr/bin/id -G -n '$member'"; #my $cmd = "/usr/bin/id -G -n '$member'";
# this will not fail in case of apache aliase before www in passwd
my $cmd = "/usr/bin/groups '$member' 2>/dev/null | cut -d' ' -f3- ";
my $groups = `$cmd 2>/dev/null`; my $groups = `$cmd 2>/dev/null`;
if ($? != 0) if ($? != 0)
{ {

10
root/etc/e-smith/events/actions/group-modify-unix
View File

@ -131,22 +131,22 @@ foreach my $group (@groups)
# Get the supplementary group list for the member we are adding or # Get the supplementary group list for the member we are adding or
# deleting. # deleting.
#my $cmd = "/usr/bin/id -G -n '$member'"; #my $cmd = "/usr/bin/id -G -n '$member'";
# this will not fail in case of apache before www in passwd # this will not fail in case of apache before www in passwd
my $cmd = "/usr/bin/groups '$member'"; my $cmd = "/usr/bin/groups '$member' 2>/dev/null | cut -d' ' -f3- ";
my $groups = `$cmd 2>/dev/null`; my $groups = `$cmd 2>/dev/null`;
if ($? != 0) if ($? != 0)
{ {
die "Failed to get supplementary group list for $member.\n"; die "Failed to get supplementary group list for $member.\n";
} }
$groups =~ s/^.*:\s+//; $groups =~ s/^.*:\s+//;
chomp ($groups); chomp ($groups);
my @groupList = split (/\s+/, $groups); my @groupList = split (/\s+/, $groups);
@groupList = grep (!/^$member$/, @groupList); @groupList = grep (!/^$member$/, @groupList);
# Apache is an alias for www # Apache is an alias for www
@groupList = map { $_ =~ s/^apache$/www/g; $_ } @groupList; @groupList = map { $_ =~ s/^apache$/www/g; $_ } @groupList;
# www needs to be in shared # www needs to be in shared
push(@groupList,'shared') if ( ($member eq 'www') and (! grep{$_ eq 'shared'} @groupList)); push(@groupList,'shared') if ( ($member eq 'www') and (! grep{$_ eq 'shared'} @groupList));
if ($oldMembers{$member}) if ($oldMembers{$member})
{ {

5
smeserver-base.spec
View File

@ -4,7 +4,7 @@ Summary: smeserver server and gateway - base module
%define name smeserver-base %define name smeserver-base
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 18 %define release 19
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -184,6 +184,9 @@ fi
%changelog %changelog
* Tue Dec 31 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-19.sme
- fix www removed from shared on group creation [SME: 12848]
* Mon Dec 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-18.sme * Mon Dec 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-18.sme
- add vlan support on External Interface [SME: 12677] - add vlan support on External Interface [SME: 12677]
- fix typo [SME: 12763] - fix typo [SME: 12763]