wurzel/fruitbasket
9
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

make givenname optional in web interface

Browse source
This commit is contained in:
Lyn Fugmann 2023-09-15 19:24:27 +02:00
parent 0c12c14148
commit 460f9c46b3
Signed by: fugi
GPG key ID: 4472A20091BFA792
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/ldap/0004-make-givenName-optional.patch
View file

@ -1,17 +1,8 @@
From 8856035c40104c6d0b9183d3ff1d209a805b5a45 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 15 Sep 2023 13:24:25 +0200
Subject: [PATCH] make givenName optional
---
internal/core/user.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/internal/core/user.go b/internal/core/user.go diff --git a/internal/core/user.go b/internal/core/user.go
index c70f9c8..c4b08d7 100644 index e74ccfe..ce03eeb 100644
--- a/internal/core/user.go --- a/internal/core/user.go
+++ b/internal/core/user.go +++ b/internal/core/user.go
@@ -76,7 +76,6 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject @@ -64,7 +64,6 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject
"uid": {u.LoginName}, "uid": {u.LoginName},
"cn": {u.FullName()}, "cn": {u.FullName()},
"sn": {u.FamilyName}, "sn": {u.FamilyName},
@ -19,7 +10,7 @@ index c70f9c8..c4b08d7 100644
"userPassword": {u.PasswordHash}, "userPassword": {u.PasswordHash},
"isMemberOf": memberOfGroupDNames, "isMemberOf": memberOfGroupDNames,
"objectClass": {"portunusPerson", "inetOrgPerson", "organizationalPerson", "person", "top"}, "objectClass": {"portunusPerson", "inetOrgPerson", "organizationalPerson", "person", "top"},
@@ -86,6 +85,9 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject @@ -74,6 +73,9 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject
if u.EMailAddress != "" { if u.EMailAddress != "" {
obj.Attributes["mail"] = []string{u.EMailAddress} obj.Attributes["mail"] = []string{u.EMailAddress}
} }
@ -29,6 +20,15 @@ index c70f9c8..c4b08d7 100644
if len(u.SSHPublicKeys) > 0 { if len(u.SSHPublicKeys) > 0 {
obj.Attributes["sshPublicKey"] = u.SSHPublicKeys obj.Attributes["sshPublicKey"] = u.SSHPublicKeys
} }
-- diff --git a/internal/frontend/users.go b/internal/frontend/users.go
2.41.0 index 225c5b3..1a961ca 100644
--- a/internal/frontend/users.go
+++ b/internal/frontend/users.go
@@ -168,7 +168,6 @@ func buildUserMasterdataFieldset(e core.Engine, u *core.User, state *h.FormState
Name: "given_name",
Label: "Given name",
Rules: []h.ValidationRule{
- core.MustNotBeEmpty,
core.MustNotHaveSurroundingSpaces,
},
},