summaryrefslogtreecommitdiff
path: root/pkg/specgen
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-09 16:04:45 -0500
committerGitHub <noreply@github.com>2020-12-09 16:04:45 -0500
commiteb053df7843d9ec4aba4ee331e04b1d1d5a4ceee (patch)
tree553d8317ff4dfd04d4fb93d9d183911e76cf8a55 /pkg/specgen
parent059c2ee739c156287237c07e07f497602bd9958d (diff)
parent1ace9e3ba618bc21ea41957f1bc60509b56a0a95 (diff)
downloadpodman-eb053df7843d9ec4aba4ee331e04b1d1d5a4ceee.tar.gz
podman-eb053df7843d9ec4aba4ee331e04b1d1d5a4ceee.tar.bz2
podman-eb053df7843d9ec4aba4ee331e04b1d1d5a4ceee.zip
Merge pull request #8670 from rhatdan/caps
Properly handle --cap-add all when running with a --user flag
Diffstat (limited to 'pkg/specgen')
-rw-r--r--pkg/specgen/generate/security.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go
index dee140282..56947ff24 100644
--- a/pkg/specgen/generate/security.go
+++ b/pkg/specgen/generate/security.go
@@ -141,7 +141,7 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator,
configSpec.Process.Capabilities.Effective = caplist
configSpec.Process.Capabilities.Permitted = caplist
} else {
- userCaps, err := capabilities.NormalizeCapabilities(s.CapAdd)
+ userCaps, err := capabilities.MergeCapabilities(nil, s.CapAdd, nil)
if err != nil {
return errors.Wrapf(err, "capabilities requested by user are not valid: %q", strings.Join(s.CapAdd, ","))
}