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

(fix) make sure we keep a pristine version of the baseDN

Browse Source
This commit is contained in:
Ludovic Marcotte
2019-02-19 13:40:58 -05:00
parent bc456dcef8
commit dad0be1815
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SoObjects/SOGo/LDAPSource.h
View File

@@ -51,6 +51,7 @@
NSString *_userPasswordAlgorithm;
NSString *_baseDN;
NSString *_pristineBaseDN;
LDAPSourceSchema *_schema;
NSString *_IDField; // the first part of a user DN
NSString *_CNField;

7
SoObjects/SOGo/LDAPSource.m
View File

@@ -85,6 +85,7 @@ static Class NSStringK;
_domain = nil;
_baseDN = nil;
_pristineBaseDN = nil;
_schema = nil;
_IDField = @"cn"; /* the first part of a user DN */
_CNField = @"cn";
@@ -131,6 +132,7 @@ static Class NSStringK;
[_hostname release];
[_encryption release];
[_baseDN release];
[_pristineBaseDN release];
[_IDField release];
[_CNField release];
[_UIDField release];
@@ -323,6 +325,7 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
andMultipleBookingsField: (NSString *) newMultipleBookingsField
{
ASSIGN(_baseDN, [newBaseDN lowercaseString]);
ASSIGN(_pristineBaseDN, [newBaseDN lowercaseString]);
if (newIDField)
ASSIGN(_IDField, [newIDField lowercaseString]);
if (newCNField)
@@ -541,9 +544,9 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
// the domain from the login.
r = [_login rangeOfString: @"@"];
if (r.location != NSNotFound &&
[_baseDN rangeOfString: @"%d"].location != NSNotFound)
[_pristineBaseDN rangeOfString: @"%d"].location != NSNotFound)
{
s = [NSMutableString stringWithString: _baseDN];
s = [NSMutableString stringWithString: _pristineBaseDN];
[s replaceOccurrencesOfString: @"%d" withString: [_login substringFromIndex: r.location+1] options: 0 range: NSMakeRange(0, [s length])];
ASSIGN(_baseDN, s);
}