Merge pull request #581 from runcom/fix-permitted-cap-drop

hqhq · web-flow · commit 263fad0457d4 · 2018-02-12T20:59:31.000+08:00
generate: fix handling of permitted caps drop
diff --git a/generate/generate.go b/generate/generate.go
@@ -1207,7 +1207,7 @@ func (g *Generator) DropProcessCapabilityPermitted(c string) error {
 	cp := strings.ToUpper(c)
 	for i, cap := range g.spec.Process.Capabilities.Permitted {
 		if strings.ToUpper(cap) == cp {
-			g.spec.Process.Capabilities.Ambient = removeFunc(g.spec.Process.Capabilities.Ambient, i)
+			g.spec.Process.Capabilities.Permitted = removeFunc(g.spec.Process.Capabilities.Permitted, i)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1207,7 +1207,7 @@ func (g *Generator) DropProcessCapabilityPermitted(c string) error {`
`1207`	`1207`	`cp := strings.ToUpper(c)`
`1208`	`1208`	`for i, cap := range g.spec.Process.Capabilities.Permitted {`
`1209`	`1209`	`if strings.ToUpper(cap) == cp {`
`1210`		`- g.spec.Process.Capabilities.Ambient = removeFunc(g.spec.Process.Capabilities.Ambient, i)`
	`1210`	`+ g.spec.Process.Capabilities.Permitted = removeFunc(g.spec.Process.Capabilities.Permitted, i)`
`1211`	`1211`	`}`
`1212`	`1212`	`}`
`1213`	`1213`