amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-26 00:43:22 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Debugging output for subscription issue"

Browse Source 
This reverts commit e33ec4e396.
This commit is contained in:
Francis Lachapelle
2018-06-27 15:39:06 -04:00
parent 821c846864
commit aa41e6d868
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoGCSFolder.m
+1 -3
View File
@@ -1649,9 +1649,7 @@ static NSArray *childRecordFields = nil;
[[SOGoCache sharedCache] registerGroup: group withName: currentUID inDomain: domain]; [[SOGoCache sharedCache] registerGroup: group withName: currentUID inDomain: domain];
} }
if (!group) if (group && [group hasMemberWithUID: uid])
[self errorWithFormat: @"Can't find group %@", group];
else if ([group hasMemberWithUID: uid])
[acls addObject: [record valueForKey: @"c_role"]]; [acls addObject: [record valueForKey: @"c_role"]];
} }
} }
SoObjects/SOGo/SOGoGroup.m
+2 -14
View File
@@ -61,7 +61,6 @@
#include "SOGoUserManager.h" #include "SOGoUserManager.h"
#include "SOGoUser.h" #include "SOGoUser.h"
#import <NGExtensions/NSObject+Logs.h>
#import <NGLdap/NGLdapEntry.h> #import <NGLdap/NGLdapEntry.h>
#define CHECK_CLASS(o) ({ \ #define CHECK_CLASS(o) ({ \
@@ -282,10 +281,6 @@
[logins addObject: login]; [logins addObject: login];
[_members addObject: user]; [_members addObject: user];
} }
else
{
[self errorWithFormat: @"Invalid uniquemember %@ (%@) in group %@", dn, login, _identifier];
}
[pool release]; [pool release];
} }
@@ -295,15 +290,12 @@
pool = [NSAutoreleasePool new]; pool = [NSAutoreleasePool new];
login = [uids objectAtIndex: i]; login = [uids objectAtIndex: i];
user = [SOGoUser userWithLogin: login roles: nil]; user = [SOGoUser userWithLogin: login roles: nil];
if (user) if (user)
{ {
[logins addObject: [user loginInDomain]]; [logins addObject: [user loginInDomain]];
[_members addObject: user]; [_members addObject: user];
} }
else
{
[self errorWithFormat: @"Invalid memberuid %@ in group %@", login, _identifier];
}
[pool release]; [pool release];
} }
@@ -312,7 +304,6 @@
// (ie., their UIDs) in memcached to speed up -hasMemberWithUID. // (ie., their UIDs) in memcached to speed up -hasMemberWithUID.
[[SOGoCache sharedCache] setValue: [logins componentsJoinedByString: @","] [[SOGoCache sharedCache] setValue: [logins componentsJoinedByString: @","]
forKey: [NSString stringWithFormat: @"%@+%@", _identifier, _domain]]; forKey: [NSString stringWithFormat: @"%@+%@", _identifier, _domain]];
[self logWithFormat: @"Cached %i members for group %@: %@", [logins count], _identifier, [logins componentsJoinedByString: @","]];
} }
else else
{ {
@@ -350,8 +341,7 @@
currentUID = [[_members objectAtIndex: count] login]; currentUID = [[_members objectAtIndex: count] login];
rc = [memberUID isEqualToString: currentUID]; rc = [memberUID isEqualToString: currentUID];
} }
if (!rc)
[self logWithFormat: @"User %@ is not a member of group %@", memberUID, _identifier];
} }
else else
{ {
@@ -372,8 +362,6 @@
a = [value componentsSeparatedByString: @","]; a = [value componentsSeparatedByString: @","];
rc = [a containsObject: memberUID]; rc = [a containsObject: memberUID];
if (!rc)
[self logWithFormat: @"User %@ is not a member of group %@ (cached)", memberUID, _identifier];
} }
return rc; return rc;