From 3e1bcb1f5d24ccf8f5a316ce52b50104172a928c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 1 Jun 2021 13:16:35 +0200 Subject: [PATCH] libcontainer/keys: var should be sessKeyID/ringID (golint) libcontainer/keys/keyctl.go:17:2: var `sessKeyId` should be `sessKeyID` (golint) sessKeyId, err := unix.KeyctlJoinSessionKeyring(name) ^ libcontainer/keys/keyctl.go:27:21: func parameter `ringId` should be `ringID` (golint) func ModKeyringPerm(ringId KeySerial, mask, setbits uint32) error { ^ Signed-off-by: Sebastiaan van Stijn --- libcontainer/keys/keyctl.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libcontainer/keys/keyctl.go b/libcontainer/keys/keyctl.go index e73af7ae2..4a60c34b8 100644 --- a/libcontainer/keys/keyctl.go +++ b/libcontainer/keys/keyctl.go @@ -14,18 +14,18 @@ import ( type KeySerial uint32 func JoinSessionKeyring(name string) (KeySerial, error) { - sessKeyId, err := unix.KeyctlJoinSessionKeyring(name) + sessKeyID, err := unix.KeyctlJoinSessionKeyring(name) if err != nil { return 0, errors.Wrap(err, "create session key") } - return KeySerial(sessKeyId), nil + return KeySerial(sessKeyID), nil } // ModKeyringPerm modifies permissions on a keyring by reading the current permissions, // anding the bits with the given mask (clearing permissions) and setting // additional permission bits -func ModKeyringPerm(ringId KeySerial, mask, setbits uint32) error { - dest, err := unix.KeyctlString(unix.KEYCTL_DESCRIBE, int(ringId)) +func ModKeyringPerm(ringID KeySerial, mask, setbits uint32) error { + dest, err := unix.KeyctlString(unix.KEYCTL_DESCRIBE, int(ringID)) if err != nil { return err } @@ -43,5 +43,5 @@ func ModKeyringPerm(ringId KeySerial, mask, setbits uint32) error { perm := (uint32(perm64) & mask) | setbits - return unix.KeyctlSetperm(int(ringId), perm) + return unix.KeyctlSetperm(int(ringID), perm) }