jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5449 from tianon/remove-libcontainer-root-special-case 

Remove "root" and "" special cases in libcontainer
This commit is contained in:
Victor Vieux 2014-04-28 16:29:08 -07:00
parent eb9c9cabcb a2efe18fb8
commit d5951041df
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nsinit/init.go
View File

@ -83,31 +83,18 @@ func (ns *linuxNs) Init(container *libcontainer.Container, uncleanRootfs, consol
}
func setupUser(container *libcontainer.Container) error {
switch container.User {
case "root", "":
if err := system.Setgroups(nil); err != nil {
return err
}
if err := system.Setresgid(0, 0, 0); err != nil {
return err
}
if err := system.Setresuid(0, 0, 0); err != nil {
return err
}
default:
uid, gid, suppGids, err := user.GetUserGroupSupplementary(container.User, syscall.Getuid(), syscall.Getgid())
if err != nil {
return err
return fmt.Errorf("GetUserGroupSupplementary %s", err)
}
if err := system.Setgroups(suppGids); err != nil {
return err
return fmt.Errorf("setgroups %s", err)
}
if err := system.Setgid(gid); err != nil {
return err
return fmt.Errorf("setgid %s", err)
}
if err := system.Setuid(uid); err != nil {
return err
}
return fmt.Errorf("setuid %s", err)
}
return nil
}