From e61e1a8096afca2cef3fd3b8d3151a5a2fe70667 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Sat, 18 May 2024 15:21:54 -0400 Subject: [PATCH] * Sat May 18 2024 Jean-Philippe Pialasse 11.0.0-8.sme - edit LDAP entries using Net::LDAP rather than cpu [SME: 12687] --- root/etc/e-smith/events/actions/ibay-modify | 10 +++++----- smeserver-ibays.spec | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/root/etc/e-smith/events/actions/ibay-modify b/root/etc/e-smith/events/actions/ibay-modify index af7d54b..d937481 100755 --- a/root/etc/e-smith/events/actions/ibay-modify +++ b/root/etc/e-smith/events/actions/ibay-modify @@ -143,7 +143,7 @@ if ($event eq 'ibay-create') foreach my $grp ( 'shared', $ibay->prop("Group") ) { $result = $ldap->modify("cn=$grp,ou=Groups,$base", add => { - "memberUid"=> [ $ibay->prop("Uid")] + "memberUid" => [ $ibayName ] }); # error code 20 is entry already exits. $result->code && ( $result->code != 20 ) && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to add (ldap) account $ibayName to supplementary group $grp.\n" ); @@ -200,11 +200,11 @@ elsif ($event eq 'ibay-modify' and $ibayName ne 'Primary') #------------------------------------------------------------ # Loop to add new user to groups "shared,". $ibay->prop("Group") #------------------------------------------------------------ - foreach my $grp ( 'shared', $ibay->prop("Group") ) { + foreach my $grp ( 'shared', $ibay->prop("Group") ) { $result = $ldap->modify("cn=$grp,ou=Groups,$base", - add=> { - "memberUid"=> [ $ibay->prop("Uid")] - } ); + add => { + "memberUid" => [ $ibayName ] + }); # error code 20 is entry already exits. $result->code && ( $result->code != 20 ) && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to add (ldap) account $ibayName to supplementary group $grp.\n" ); } diff --git a/smeserver-ibays.spec b/smeserver-ibays.spec index e2b18fc..f2da036 100644 --- a/smeserver-ibays.spec +++ b/smeserver-ibays.spec @@ -4,7 +4,7 @@ Summary: smeserver server and gateway - ibays module %define name smeserver-ibays Name: %{name} %define version 11.0.0 -%define release 7 +%define release 8 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -27,7 +27,7 @@ Provides: e-smith-ibays smeserver server and gateway software - ibays module. %changelog -* Sat May 18 2024 Jean-Philippe Pialasse 11.0.0-7.sme +* Sat May 18 2024 Jean-Philippe Pialasse 11.0.0-8.sme - edit LDAP entries using Net::LDAP rather than cpu [SME: 12687] * Sat Apr 13 2024 Jean-Philippe Pialasse 11.0.0-6.sme