From 3792d545d102a6c43f6f35520eab66899729f240 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhaferkamp@owncloud.com>
Date: Thu, 24 Mar 2022 09:11:57 +0100
Subject: [PATCH] ldap: Allow groups to have no gidNumber

Similar to the user-provider allow a group to have no gidNumber. Assign
a default in that case.
---
 changelog/unreleased/group-without-gidnumber.md |  6 ++++++
 pkg/group/manager/ldap/ldap.go                  | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 changelog/unreleased/group-without-gidnumber.md

diff --git a/changelog/unreleased/group-without-gidnumber.md b/changelog/unreleased/group-without-gidnumber.md
new file mode 100644
index 00000000000..331d247329a
--- /dev/null
+++ b/changelog/unreleased/group-without-gidnumber.md
@@ -0,0 +1,6 @@
+Change: Allow LDAP groups to have no gidNumber
+
+Similar to the user-provider allow a group to have no gidNumber. Assign
+a default in that case.
+
+https://github.com/cs3org/reva/pull/xxxx
diff --git a/pkg/group/manager/ldap/ldap.go b/pkg/group/manager/ldap/ldap.go
index 1bd5b1fa64a..7efd05b2cf5 100644
--- a/pkg/group/manager/ldap/ldap.go
+++ b/pkg/group/manager/ldap/ldap.go
@@ -239,9 +239,14 @@ func (m *manager) GetGroupByClaim(ctx context.Context, claim, value string) (*gr
 	if err != nil {
 		return nil, err
 	}
-	gidNumber, err := strconv.ParseInt(sr.Entries[0].GetEqualFoldAttributeValue(m.c.Schema.GIDNumber), 10, 64)
-	if err != nil {
-		return nil, err
+
+	gidNumber := m.c.Nobody
+	gidValue := sr.Entries[0].GetEqualFoldAttributeValue(m.c.Schema.GIDNumber)
+	if gidValue != "" {
+		gidNumber, err = strconv.ParseInt(gidValue, 10, 64)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	g := &grouppb.Group{