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

fix(aa): ineffective assignment

Browse source
This commit is contained in:
Alexandre Pujol 2024-06-23 10:57:46 +01:00
parent ff5ff965cd
commit 228d3b653c
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
12 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/aa/signal.go
View file

@ -86,10 +86,12 @@ func (r *Signal) Merge(other Rule) bool {
switch {
case r.Peer == o.Peer && compare(r.Set, o.Set) == 0:
r.Access = merge(r.Kind(), "access", r.Access, o.Access)
return r.RuleBase.merge(o.RuleBase)
b := &r.RuleBase
return b.merge(o.RuleBase)
case r.Peer == o.Peer && compare(r.Access, o.Access) == 0:
r.Set = merge(r.Kind(), "set", r.Set, o.Set)
return r.RuleBase.merge(o.RuleBase)
b := &r.RuleBase
return b.merge(o.RuleBase)
}
return false
}