amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-25 11:54:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'upstream-master' into merge-from-upstream

Browse Source 
Conflicts:
	SoObjects/SOGo/LDAPSource.m
	SoObjects/SOGo/SOGoUserManager.m
This commit is contained in:
Julio García
2015-06-02 12:27:20 +02:00
parent 95f11f6d0d 96d88de564
commit c61eca27a1
152 changed files with 6559 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoSession.m
+1 -3
View File
@@ -262,9 +262,7 @@
// The domain is probably appended to the username;
// make sure it is defined as a domain in the configuration.
*theDomain = [*theLogin substringFromIndex: (r.location + r.length)];
if ([[sd domainIds] containsObject: *theDomain])
*theLogin = [*theLogin substringToIndex: r.location];
else
if (![[sd domainIds] containsObject: *theDomain])
*theDomain = nil;
}
}