felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(aa): update parse definition to last changes.

Browse source
This commit is contained in:
Alexandre Pujol 2024-06-19 23:24:43 +01:00
parent 163c5be61c
commit cd03640c10
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/aa/resolve.go
View file

@ -153,7 +153,7 @@ func (f *AppArmorProfileFile) resolveInclude(include *Include) error {
if err != nil { if err != nil {
return err return err
} }
if err := iFile.Parse(raw); err != nil { if _, err := iFile.Parse(raw); err != nil {
return err return err
} }
} }

2
pkg/prebuild/builder/userspace.go
View file

@ -38,7 +38,7 @@ func (b Userspace) Apply(opt *Option, profile string) (string, error) {
} }
f := aa.DefaultTunables() f := aa.DefaultTunables()
if err := f.Parse(profile); err != nil { if _, err := f.Parse(profile); err != nil {
return "", err return "", err
} }
if err := f.Resolve(); err != nil { if err := f.Resolve(); err != nil {

2
pkg/prebuild/directive/exec.go
View file

@ -42,7 +42,7 @@ func (d Exec) Apply(opt *Option, profileRaw string) (string, error) {
for name := range opt.ArgMap { for name := range opt.ArgMap {
profiletoTransition := util.MustReadFile(cfg.RootApparmord.Join(name)) profiletoTransition := util.MustReadFile(cfg.RootApparmord.Join(name))
dstProfile := aa.DefaultTunables() dstProfile := aa.DefaultTunables()
if err := dstProfile.Parse(profiletoTransition); err != nil { if _, err := dstProfile.Parse(profiletoTransition); err != nil {
return "", err return "", err
} }
if err := dstProfile.Resolve(); err != nil { if err := dstProfile.Resolve(); err != nil {