diff options
| author | Joe Richey joerichey@google.com <joerichey@google.com> | 2017-08-23 12:29:10 -0700 |
|---|---|---|
| committer | Joe Richey joerichey@google.com <joerichey@google.com> | 2017-08-23 12:29:10 -0700 |
| commit | b15792b8d7c197d84970415fd2525c51aee3996c (patch) | |
| tree | 20bf5e9f241c8b26b0eeeb3ea8394cdea9ca7af6 /security | |
| parent | ef5cc07774674c66b5dbeb7c655a26ac6371e378 (diff) | |
Added some documentation and improved security API
Diffstat (limited to 'security')
| -rw-r--r-- | security/keyring.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/security/keyring.go b/security/keyring.go index f75b189..28225b0 100644 --- a/security/keyring.go +++ b/security/keyring.go @@ -151,11 +151,19 @@ func getUserKeyringID() (int, error) { func keyringLink(keyID int, keyringID int) error { _, err := unix.KeyctlInt(unix.KEYCTL_LINK, keyID, keyringID, 0, 0) log.Printf("KeyctlLink(%d, %d) = %v", keyID, keyringID, err) - return errors.Wrap(ErrKeyringLink, err.Error()) + + if err != nil { + return errors.Wrap(ErrKeyringLink, err.Error()) + } + return err } func keyringUnlink(keyID int, keyringID int) error { _, err := unix.KeyctlInt(unix.KEYCTL_UNLINK, keyID, keyringID, 0, 0) log.Printf("KeyctlUnlink(%d, %d) = %v", keyID, keyringID, err) - return errors.Wrap(ErrKeyringUnlink, err.Error()) + + if err != nil { + return errors.Wrap(ErrKeyringUnlink, err.Error()) + } + return err } |