From d274456f3eb9f2a3dc518985ec22d236d3bc3f6c Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sun, 20 Mar 2016 18:08:20 +1100 Subject: [PATCH] profiles: apparmor: actually calculate version In order to check that we can have the `ptrace` rule, we need to actually calculate the version of apparmor_parser. Signed-off-by: Aleksa Sarai --- profiles/apparmor/apparmor.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/profiles/apparmor/apparmor.go b/profiles/apparmor/apparmor.go index a18d0c5f2d..51dfa5cf9c 100644 --- a/profiles/apparmor/apparmor.go +++ b/profiles/apparmor/apparmor.go @@ -38,14 +38,23 @@ func (p *profileData) generateDefault(out io.Writer) error { if err != nil { return err } + if macroExists("tunables/global") { p.Imports = append(p.Imports, "#include ") } else { p.Imports = append(p.Imports, "@{PROC}=/proc/") } + if macroExists("abstractions/base") { p.InnerImports = append(p.InnerImports, "#include ") } + + ver, err := aaparser.GetVersion() + if err != nil { + return err + } + p.Version = ver + if err := compiled.Execute(out, p); err != nil { return err }