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

16
pkg/aa/preamble.go
View file

@ -49,6 +49,10 @@ func (r *Comment) Compare(other Rule) int {
return 0 // Comments are always equal to each other as they are not compared
}
func (r *Comment) Merge(other Rule) bool {
return false // Never merge comments
}
type Abi struct {
Base
Path string
@ -101,6 +105,10 @@ func (r *Abi) Compare(other Rule) int {
return compare(r.IsMagic, o.IsMagic)
}
func (r *Abi) Merge(other Rule) bool {
return false // Never merge abi
}
type Alias struct {
Base
Path string
@ -145,6 +153,10 @@ func (r *Alias) Compare(other Rule) int {
return compare(r.RewrittenPath, o.RewrittenPath)
}
func (r *Alias) Merge(other Rule) bool {
return false // Never merge alias
}
type Include struct {
Base
IfExists bool
@ -218,6 +230,10 @@ func (r *Include) Compare(other Rule) int {
return compare(r.IfExists, o.IfExists)
}
func (r *Include) Merge(other Rule) bool {
return false // Never merge include
}
type Variable struct {
Base
Name string