Merge pull request #165 from Zentyal/jgarcia/uids_login_party_hard

SOGoUser bad initialization on multidomain environment
This commit is contained in:
Enrique J. Hernández
2015-07-31 18:46:15 +02:00
+14 -3
View File
@@ -394,11 +394,22 @@ static Class NSNullK;
- (NSString *) getUIDForEmail: (NSString *) email
{
NSDictionary *contactInfos;
NSDictionary *info;
SOGoSystemDefaults *sd;
NSString *uid, *domain;
contactInfos = [self contactInfosForUserWithUIDorEmail: email];
info = [self contactInfosForUserWithUIDorEmail: email];
uid = [info objectForKey: @"c_uid"];
return [contactInfos objectForKey: @"c_uid"];
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainBasedUID]
&& ![[info objectForKey: @"DomainLessLogin"] boolValue])
{
domain = [info objectForKey: @"c_domain"];
uid = [NSString stringWithFormat: @"%@@%@", uid, domain];
}
return uid;
}
- (BOOL) _sourceChangePasswordForLogin: (NSString *) login