From c61ecb51a03a2fd030a6fa21a1e0f3e0f1ba4670 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Sat, 6 Apr 2024 17:02:43 -0400
Subject: [PATCH] * Sat Apr 06 2024 Jean-Philippe Pialasse <jpp@koozali.org>
 11.0.0-5.sme - drop rssh group reverting  patch of 11753 [SME: 12510]

---
 root/sbin/e-smith/ldif-fix | 4 ----
 smeserver-ldap.spec        | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/root/sbin/e-smith/ldif-fix b/root/sbin/e-smith/ldif-fix
index ee14668..72da602 100644
--- a/root/sbin/e-smith/ldif-fix
+++ b/root/sbin/e-smith/ldif-fix
@@ -74,7 +74,6 @@ foreach (qw/Users Groups Computers/) {
 $data->{"cn=nobody,$groupou,$basedn"}->{objectclass} = [ qw/posixGroup/ ];
 $data->{"uid=www,$userou,$basedn"}->{objectclass} = [ qw/account/ ];
 $data->{"cn=www,$groupou,$basedn"} = { objectclass => [ qw/posixGroup/ ], memberuid   => [ qw/admin/ ] };
-$data->{"cn=rsshusers,$groupou,$basedn"}->{objectclass} = [ qw/posixGroup/ ];
 $data->{"cn=shared,$groupou,$basedn"} = {
     objectclass => [ qw/posixGroup mailboxRelatedObject/ ],
     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
         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') {
             # Allow removal of shadow properties
             push @{$data->{$dn}->{_delete}->{objectclass}}, 'shadowAccount';
diff --git a/smeserver-ldap.spec b/smeserver-ldap.spec
index 64ba50c..240ade7 100644
--- a/smeserver-ldap.spec
+++ b/smeserver-ldap.spec
@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - LDAP module
 %define name smeserver-ldap
 Name: %{name}
 %define version 11.0.0
-%define release 4
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -29,6 +29,9 @@ Provides: e-smith-ldap
 smeserver server and gateway software - LDAP module.
 
 %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
 - Update createlinks to create smeserver-package-update event[SME: 12579]