From 4d9d40e1ba5b104e2bf1bd4b0763b63b3fda641c Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Mon, 25 Sep 2023 17:44:51 +0200 Subject: [PATCH] graph/education: Use helper for creating attribute list (cherry picked from commit 16debe6fa5bc20557158e086ce2c1f909e175f81) --- services/graph/pkg/identity/ldap_education_school.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/graph/pkg/identity/ldap_education_school.go b/services/graph/pkg/identity/ldap_education_school.go index 7bf12e23a..3f389a30a 100644 --- a/services/graph/pkg/identity/ldap_education_school.go +++ b/services/graph/pkg/identity/ldap_education_school.go @@ -633,17 +633,12 @@ func (i *LDAP) RemoveClassFromEducationSchool(ctx context.Context, schoolNumberO } func (i *LDAP) getSchoolByDN(dn string) (*ldap.Entry, error) { - attrs := []string{ - i.educationConfig.schoolAttributeMap.displayName, - i.educationConfig.schoolAttributeMap.id, - i.educationConfig.schoolAttributeMap.schoolNumber, - } filter := fmt.Sprintf("(objectClass=%s)", i.educationConfig.schoolObjectClass) if i.educationConfig.schoolFilter != "" { filter = fmt.Sprintf("(&%s(%s))", filter, i.educationConfig.schoolFilter) } - return i.getEntryByDN(dn, attrs, filter) + return i.getEntryByDN(dn, i.getEducationSchoolAttrTypes(), filter) } func (i *LDAP) getSchoolByNumberOrID(numberOrID string) (*ldap.Entry, error) {