aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJoseph Richey <joerichey94@gmail.com>2017-10-19 03:37:54 -0700
committerJoseph Richey <joerichey94@gmail.com>2017-10-19 03:54:50 -0700
commit3269bc539e52cdced8c03a628e4fdf22942ece4b (patch)
tree062792c21fe6751e14f827616bf454e62210a1dc /security
parentfe76f6f1cc71c75bc1124f4fe3171c679c06aa1c (diff)
util: Add CheckIfRoot
Replace IsUserRoot with CheckIfRoot. This allows all functions to use the same error handling when a user is not root.
Diffstat (limited to 'security')
-rw-r--r--security/keyring.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keyring.go b/security/keyring.go
index ab65631..7ce163e 100644
--- a/security/keyring.go
+++ b/security/keyring.go
@@ -114,7 +114,7 @@ func UserKeyringID(target *user.User, checkSession bool) (int, error) {
return 0, errors.Wrap(ErrAccessUserKeyring, err.Error())
}
- if !util.IsUserRoot() {
+ if util.CurrentUserID() != 0 {
// Make sure the returned keyring will be accessible by checking
// that it is in the session keyring.
if checkSession && !isUserKeyringInSession(uid) {