LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Debugging output for subscription issue" 

This reverts commit e33ec4e396.
pull/229/merge
Francis Lachapelle 2018-06-27 15:39:06 -04:00
parent 821c846864
commit aa41e6d868
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SoObjects/SOGo/SOGoGCSFolder.m
View File

@ -1649,9 +1649,7 @@ static NSArray *childRecordFields = nil;
[[SOGoCache sharedCache] registerGroup: group withName: currentUID inDomain: domain];
}
if (!group)
[self errorWithFormat: @"Can't find group %@", group];
else if ([group hasMemberWithUID: uid])
if (group && [group hasMemberWithUID: uid])
[acls addObject: [record valueForKey: @"c_role"]];
}
}

16
SoObjects/SOGo/SOGoGroup.m
View File

@ -61,7 +61,6 @@
#include "SOGoUserManager.h"
#include "SOGoUser.h"
#import <NGExtensions/NSObject+Logs.h>
#import <NGLdap/NGLdapEntry.h>
#define CHECK_CLASS(o) ({ \
@ -282,10 +281,6 @@
[logins addObject: login];
[_members addObject: user];
}
else
{
[self errorWithFormat: @"Invalid uniquemember %@ (%@) in group %@", dn, login, _identifier];
}
[pool release];
}
@ -295,15 +290,12 @@
pool = [NSAutoreleasePool new];
login = [uids objectAtIndex: i];
user = [SOGoUser userWithLogin: login roles: nil];
if (user)
{
[logins addObject: [user loginInDomain]];
[_members addObject: user];
}
else
{
[self errorWithFormat: @"Invalid memberuid %@ in group %@", login, _identifier];
}
[pool release];
}
@ -312,7 +304,6 @@
// (ie., their UIDs) in memcached to speed up -hasMemberWithUID.
[[SOGoCache sharedCache] setValue: [logins componentsJoinedByString: @","]
forKey: [NSString stringWithFormat: @"%@+%@", _identifier, _domain]];
[self logWithFormat: @"Cached %i members for group %@: %@", [logins count], _identifier, [logins componentsJoinedByString: @","]];
}
else
{
@ -350,8 +341,7 @@
currentUID = [[_members objectAtIndex: count] login];
rc = [memberUID isEqualToString: currentUID];
}
if (!rc)
[self logWithFormat: @"User %@ is not a member of group %@", memberUID, _identifier];
}
else
{
@ -372,8 +362,6 @@
a = [value componentsSeparatedByString: @","];
rc = [a containsObject: memberUID];
if (!rc)
[self logWithFormat: @"User %@ is not a member of group %@ (cached)", memberUID, _identifier];
}
return rc;