qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-07 08:46:19 -07:00
Code Releases Activity

os/user: implement (*User).GroupIds on solaris

Browse Source 
It seems like getgrouplist is supported since Solaris 11.3 (released in
2016):
https://docs.oracle.com/cd/E86824_01/html/E54766/getgrouplist-3c.html

Use it to implement (*User).GroupIds on solaris, like on other Unix
platforms.

Unfortunately it looks like getgrouplist was added to illumos only
fairly recently, see
f2c438c505

Thus, don't use it on GOOS=illumos for now.

Updates #14709

Change-Id: Ibfcdbfca6b7d1af96630512d08921e5637ca76d4
Reviewed-on: https://go-review.googlesource.com/c/go/+/315278
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Tobias Klauser 2021-05-01 15:41:34 +00:00 committed by Tobias Klauser
parent b177b2d51e
commit abb110bf3d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/user/getgrouplist_unix.go
View File

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build (dragonfly || freebsd || (!android && linux) || netbsd || openbsd) && cgo && !osusergo //go:build (dragonfly || freebsd || (!android && linux) || netbsd || openbsd || (solaris && !illumos)) && cgo && !osusergo
// +build dragonfly freebsd !android,linux netbsd openbsd // +build dragonfly freebsd !android,linux netbsd openbsd solaris,!illumos
// +build cgo // +build cgo
// +build !osusergo // +build !osusergo

6
src/os/user/listgroups_solaris.go → src/os/user/listgroups_illumos.go
View File

@ -1,4 +1,4 @@
// Copyright 2016 The Go Authors. All rights reserved. // Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -6,7 +6,7 @@
// +build cgo,!osusergo // +build cgo,!osusergo
// Even though this file requires no C, it is used to provide a // Even though this file requires no C, it is used to provide a
// listGroup stub because all the other Solaris calls work. Otherwise, // listGroup stub because all the other illumos calls work. Otherwise,
// this stub will conflict with the lookup_stubs.go fallback. // this stub will conflict with the lookup_stubs.go fallback.
package user package user
@ -14,5 +14,5 @@ package user
import "fmt" import "fmt"
func listGroups(u *User) ([]string, error) { func listGroups(u *User) ([]string, error) {
return nil, fmt.Errorf("user: list groups for %s: not supported on Solaris", u.Username) return nil, fmt.Errorf("user: list groups for %s: not supported on illumos", u.Username)
} }

4
src/os/user/listgroups_unix.go
View File

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build (dragonfly || darwin || freebsd || (!android && linux) || netbsd || openbsd) && cgo && !osusergo //go:build (dragonfly || darwin || freebsd || (!android && linux) || netbsd || openbsd || (solaris && !illumos)) && cgo && !osusergo
// +build dragonfly darwin freebsd !android,linux netbsd openbsd // +build dragonfly darwin freebsd !android,linux netbsd openbsd solaris,!illumos
// +build cgo // +build cgo
// +build !osusergo // +build !osusergo

2
src/os/user/user_test.go
View File

@ -132,7 +132,7 @@ func TestGroupIds(t *testing.T) {
if runtime.GOOS == "aix" { if runtime.GOOS == "aix" {
t.Skip("skipping GroupIds, see golang.org/issue/30563") t.Skip("skipping GroupIds, see golang.org/issue/30563")
} }
if runtime.GOOS == "solaris" || runtime.GOOS == "illumos" { if runtime.GOOS == "illumos" {
t.Skip("skipping GroupIds, see golang.org/issue/14709") t.Skip("skipping GroupIds, see golang.org/issue/14709")
} }
user, err := Current() user, err := Current()