From 6a4d03b35f38debb5fdefe0b6a9861c92011dda1 Mon Sep 17 00:00:00 2001 From: Hivert Quentin Date: Wed, 20 Nov 2024 15:44:34 +0100 Subject: [PATCH] fix(users): try to always use the user domain in the basDN with %d --- SoObjects/SOGo/LDAPSource.m | 7 +++++-- SoObjects/SOGo/SOGoUserManager.m | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 72640141d..0da10bd66 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -1435,15 +1435,18 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses contacts = [NSMutableArray array]; + NSLog(@"fetchContactsMatching: baseDN was %@", _baseDN); if(theDomain != nil && [theDomain length] > 0) { - if ([_baseDN rangeOfString: @"%d"].location != NSNotFound) + NSLog(@"fetchContactsMatching: the domain is %@", theDomain); + if ([_pristineBaseDN rangeOfString: @"%d"].location != NSNotFound) { - s = [NSMutableString stringWithString: _baseDN]; + s = [NSMutableString stringWithString: _pristineBaseDN]; [s replaceOccurrencesOfString: @"%d" withString: theDomain options: 0 range: NSMakeRange(0, [s length])]; ASSIGN(_baseDN, s); } } + NSLog(@"fetchContactsMatching: baseDN is now %@", _baseDN); if ([match length] > 0 || !_listRequiresDot) { diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m index be9916bf7..ba53568d6 100644 --- a/SoObjects/SOGo/SOGoUserManager.m +++ b/SoObjects/SOGo/SOGoUserManager.m @@ -1359,8 +1359,7 @@ static const NSString *kObfuscatedSecondaryEmailKey = @"obfuscatedSecondaryEmail - (NSArray *) fetchContactsMatching: (NSString *) filter inDomain: (NSString *) domain { - return [self - _fetchEntriesInSources: [self addressBookSourceIDsInDomain: domain] + return [self _fetchEntriesInSources: [self addressBookSourceIDsInDomain: domain] matching: filter inDomain: domain]; }