From d578a2603a66bb0af0f184e23137abc894bca16e Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 14 Oct 2020 10:50:39 +0200 Subject: [PATCH] Fix service user --- accounts/pkg/service/v0/accounts.go | 2 +- accounts/pkg/service/v0/service.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/accounts/pkg/service/v0/accounts.go b/accounts/pkg/service/v0/accounts.go index 35ecca2796..d448742211 100644 --- a/accounts/pkg/service/v0/accounts.go +++ b/accounts/pkg/service/v0/accounts.go @@ -87,7 +87,7 @@ func (s Service) hasAccountManagementPermissions(ctx context.Context) bool { // serviceUserToIndex temporarily adds a service user to the index, which is supposed to be removed before the lock on the handler function is released func (s Service) serviceUserToIndex() (teardownServiceUser func()) { if s.Config.ServiceUser.Username != "" && s.Config.ServiceUser.UUID != "" { - err := s.index.Add(s.getInMemoryServiceUser()) + _, err := s.index.Add(s.getInMemoryServiceUser()) if err != nil { s.log.Logger.Err(err).Msg("service user was configured but failed to be added to the index") } else { diff --git a/accounts/pkg/service/v0/service.go b/accounts/pkg/service/v0/service.go index 9f8757d94c..19e23a53a5 100644 --- a/accounts/pkg/service/v0/service.go +++ b/accounts/pkg/service/v0/service.go @@ -236,6 +236,7 @@ func (s Service) createDefaultAccounts() (err error) { } } + // TODO: can be removed again as soon as we respect the predefined UIDs and GIDs from the account. Then no autoincrement is happening, therefore we don't need to update accounts. changed := false for _, r := range results { if r.Field == "UidNumber" || r.Field == "GidNumber" { @@ -324,6 +325,7 @@ func (s Service) createDefaultGroups() (err error) { } } + // TODO: can be removed again as soon as we respect the predefined GIDs from the group. Then no autoincrement is happening, therefore we don't need to update groups. for _, r := range results { if r.Field == "GidNumber" { gid, err := strconv.ParseInt(path.Base(r.Value), 10, 0)