Skip to content

Commit 306d233

Browse files
committed
Fixed extra group memberships not being deleted.
This was visible with error message "Group member #%d: User not found." due to a sanity check that shouldn't be here. (This in fact blocked knowledge of the extra membership being known.) Fixes #2
1 parent 4842e91 commit 306d233

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/LdapSyncCommand.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,11 +1406,6 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
14061406
continue; // The Gitlab root user should never be updated from LDAP.
14071407
}
14081408

1409-
if (!isset($membersOfThisGroup[$gitlabUserId]) || $membersOfThisGroup[$gitlabUserId] != $gitlabUserName) {
1410-
$this->logger->error(sprintf("Group member #%d: User not found.", $n));
1411-
continue;
1412-
}
1413-
14141409
$this->logger->info(sprintf("Found Gitlab group member #%d \"%s\".", $gitlabUserId, $gitlabUserName));
14151410
if (isset($userGroupMembersSync["found"][$gitlabUserId]) || $this->in_array_i($gitlabUserName, $userGroupMembersSync["found"])) {
14161411
$this->logger->warning(sprintf("Duplicate Gitlab group member #%d \"%s\".", $gitlabUserId, $gitlabUserName));

0 commit comments

Comments
 (0)