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:
@@ -7,7 +7,7 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os/user"
|
||||
"strings"
|
||||
|
||||
@@ -44,7 +44,7 @@ func lookupUserAndGroup(name string, group bool) (string, string, error) {
|
||||
return "", err
|
||||
})
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
return "", "", fmt.Errorf("lookup group %v: %w", name, err)
|
||||
}
|
||||
return "", gr, nil
|
||||
}
|
||||
@@ -57,7 +57,7 @@ func lookupUserAndGroup(name string, group bool) (string, string, error) {
|
||||
return "", err
|
||||
})
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
return "", "", fmt.Errorf("lookup user %v: %w", name, err)
|
||||
}
|
||||
return us, "", nil
|
||||
}
|
||||
@@ -74,9 +74,9 @@ func lookupWithoutDomain(name string, lookup func(s string) (string, error)) (st
|
||||
}
|
||||
parts := strings.Split(name, `\`)
|
||||
if len(parts) == 2 {
|
||||
if v, err := lookup(parts[1]); err == nil {
|
||||
if v, err = lookup(parts[1]); err == nil {
|
||||
return v, nil
|
||||
}
|
||||
}
|
||||
return "", errors.New("lookup failed")
|
||||
return "", err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user