diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
| commit | 8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5 (patch) | |
| tree | ba71646a10b518372d110532d86fcf0b98edc14f /src/pkg/syscall/exec_linux.go | |
| parent | 3bb719bbf3cdb97b3901f3baaa2da9d02a5c3cdb (diff) | |
| parent | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (diff) | |
| download | golang-8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5.tar.gz | |
Merge tag 'upstream/1.3' into debian-sid
Upstream version 1.3
Diffstat (limited to 'src/pkg/syscall/exec_linux.go')
| -rw-r--r-- | src/pkg/syscall/exec_linux.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pkg/syscall/exec_linux.go b/src/pkg/syscall/exec_linux.go index a1656e8dc..f27950f73 100644 --- a/src/pkg/syscall/exec_linux.go +++ b/src/pkg/syscall/exec_linux.go @@ -131,11 +131,11 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr // User and groups if cred := sys.Credential; cred != nil { ngroups := uintptr(len(cred.Groups)) - groups := uintptr(0) + var groups unsafe.Pointer if ngroups > 0 { - groups = uintptr(unsafe.Pointer(&cred.Groups[0])) + groups = unsafe.Pointer(&cred.Groups[0]) } - _, _, err1 = RawSyscall(SYS_SETGROUPS, ngroups, groups, 0) + _, _, err1 = RawSyscall(SYS_SETGROUPS, ngroups, uintptr(groups), 0) if err1 != 0 { goto childerror } |