felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix(model): clarify errors on Windows user/group lookup (fixes #9929) (#9930)

Browse Source 
Currently, this just results in a very ambiguous `setting metadata: lookup
failed` while it could report what it's looking up and why it failed
(not found, etc).
This commit is contained in:
Jakob Borg
2025-01-20 09:59:05 +01:00
committed by GitHub
parent 36cd70040a
commit 0395cf2bc0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/folder_sendrecv_windows.go
+5 -5
View File
@@ -7,7 +7,7 @@
package model package model
import ( import (
"errors" "fmt"
"os/user" "os/user"
"strings" "strings"
@@ -44,7 +44,7 @@ func lookupUserAndGroup(name string, group bool) (string, string, error) {
return "", err return "", err
}) })
if err != nil { if err != nil {
return "", "", err return "", "", fmt.Errorf("lookup group %v: %w", name, err)
} }
return "", gr, nil return "", gr, nil
} }
@@ -57,7 +57,7 @@ func lookupUserAndGroup(name string, group bool) (string, string, error) {
return "", err return "", err
}) })
if err != nil { if err != nil {
return "", "", err return "", "", fmt.Errorf("lookup user %v: %w", name, err)
} }
return us, "", nil return us, "", nil
} }
@@ -74,9 +74,9 @@ func lookupWithoutDomain(name string, lookup func(s string) (string, error)) (st
} }
parts := strings.Split(name, `\`) parts := strings.Split(name, `\`)
if len(parts) == 2 { if len(parts) == 2 {
if v, err := lookup(parts[1]); err == nil { if v, err = lookup(parts[1]); err == nil {
return v, nil return v, nil
} }
} }
return "", errors.New("lookup failed") return "", err
} }