zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-10-16 12:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fully remove security package

Browse Source 
This moves the capabilities package into the root package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2015-02-09 15:38:28 -08:00
parent ad49d71504
commit 758d151e61
5 changed files with 96 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
linux_init.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/docker/libcontainer/configs"
"github.com/docker/libcontainer/netlink"
"github.com/docker/libcontainer/security/capabilities"
"github.com/docker/libcontainer/system"
"github.com/docker/libcontainer/user"
"github.com/docker/libcontainer/utils"
@@ -97,8 +96,12 @@ func finalizeNamespace(config *initConfig) error {
if err := utils.CloseExecFrom(3); err != nil {
return err
}
w, err := newCapWhitelist(config.Config.Capabilities)
if err != nil {
return err
}
// drop capabilities in bounding set before changing user
if err := capabilities.DropBoundingSet(config.Config.Capabilities); err != nil {
if err := w.dropBoundingSet(); err != nil {
return err
}
// preserve existing capabilities while we change users
@@ -112,7 +115,7 @@ func finalizeNamespace(config *initConfig) error {
return err
}
// drop all other capabilities
if err := capabilities.DropCapabilities(config.Config.Capabilities); err != nil {
if err := w.drop(); err != nil {
return err
}
if config.Cwd != "" {