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

feat(aa): be more verbose on rule.Merge

Browse source
This commit is contained in:
Alexandre Pujol 2024-06-25 20:10:12 +01:00
parent 880f0ef37e
commit 7c006dee0a
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
11 changed files with 69 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pkg/aa/signal.go
View file

@ -89,6 +89,20 @@ func (r *Signal) Validate() error {
return nil
}
func (r *Signal) Compare(other Rule) int {
o, _ := other.(*Signal)
if res := compare(r.Access, o.Access); res != 0 {
return res
}
if res := compare(r.Set, o.Set); res != 0 {
return res
}
if res := compare(r.Peer, o.Peer); res != 0 {
return res
}
return r.Qualifier.Compare(o.Qualifier)
}
func (r *Signal) Merge(other Rule) bool {
o, _ := other.(*Signal)
@ -107,17 +121,3 @@ func (r *Signal) Merge(other Rule) bool {
}
return false
}
func (r *Signal) Compare(other Rule) int {
o, _ := other.(*Signal)
if res := compare(r.Access, o.Access); res != 0 {
return res
}
if res := compare(r.Set, o.Set); res != 0 {
return res
}
if res := compare(r.Peer, o.Peer); res != 0 {
return res
}
return r.Qualifier.Compare(o.Qualifier)
}