amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-17 22:24:54 +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/LDAPSource.m
+1 -1
View File
@@ -737,7 +737,7 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
}
NS_HANDLER
{
if ([[localException name] isEqual: @"LDAPException"] &&
if ([[localException name] isEqual: @"LDAPException"] &&
([[[localException userInfo] objectForKey: @"error_code"] intValue] == LDAP_CONSTRAINT_VIOLATION))
{
*perr = PolicyInsufficientPasswordQuality;