Merge pull request #120 from zentyal/master

Fixes for OpenChange integration from Zentyal
This commit is contained in:
extrafu committed 2015-11-05 09:45:51 -05:00
commit e428e74e6c
18 files changed
+282 -108

No files matched your search

@@ -48,6 +48,7 @@
#import <SOGo/SOGoPermissions.h>
#import <SOGo/SOGoSource.h>
#import <SOGo/SOGoUserSettings.h>
#import <SOGo/SOGoSystemDefaults.h>
#import <SOGo/WORequest+SOGo.h>
#import <SOGo/WOResponse+SOGo.h>
@@ -236,6 +237,13 @@
data = @"";
[newRecord setObject: data forKey: @"c_cn"];
if ([[SOGoSystemDefaults sharedSystemDefaults] enableDomainBasedUID])
{
data = [oldRecord objectForKey: @"c_domain"];
if (data)
[newRecord setObject: data forKey: @"c_domain"];
}
data = [oldRecord objectForKey: @"mail"];
if (!data)
data = @"";