amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-05 20:10:33 +00:00
Code Issues Projects Releases Wiki Activity

New paramter SOGoLDAPGroupExpansionEnabled

Browse Source 
Fixes #2506
This commit is contained in:
Francis Lachapelle
2019-09-05 12:42:25 -04:00
parent 1641235163
commit 25021c192c
8 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/LDAPSource.m
+14 -1
View File
@@ -165,7 +165,7 @@ static Class NSStringK;
inDomain: (NSString *) sourceDomain
{
SOGoDomainDefaults *dd;
NSNumber *udQueryLimit, *udQueryTimeout, *dotValue;
NSNumber *udQueryLimit, *udQueryTimeout, *udGroupExpansionEnabled, *dotValue;
if ((self = [self init]))
{
@@ -238,6 +238,14 @@ static Class NSStringK;
else
_queryTimeout = [dd ldapQueryTimeout];
if ([[udSource allKeys] containsObject: @"SOGoLDAPGroupExpansionEnabled"])
{
udGroupExpansionEnabled = [udSource objectForKey: @"SOGoLDAPGroupExpansionEnabled"];
_groupExpansionEnabled = [udGroupExpansionEnabled boolValue];
}
else
_groupExpansionEnabled = [dd ldapGroupExpansionEnabled];
ASSIGN(_modulesConstraints, [udSource objectForKey: @"ModulesConstraints"]);
ASSIGN(_filter, [udSource objectForKey: @"filter"]);
ASSIGN(_userPasswordAlgorithm, [udSource objectForKey: @"userPasswordAlgorithm"]);
@@ -1461,6 +1469,11 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
return _groupObjectClasses;
}
- (BOOL) groupExpansionEnabled
{
return _groupExpansionEnabled;
}
static NSArray *
_convertRecordToLDAPAttributes (LDAPSourceSchema *schema, NSDictionary *ldifRecord)
{