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

refractor(aa): rename base struct from RuleBase to Base

Browse source
This commit is contained in:
Alexandre Pujol 2024-06-25 19:50:27 +01:00
parent 5b73923385
commit 272072d2a5
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
24 changed files with 150 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkg/aa/signal.go
View file

@ -32,7 +32,7 @@ func init() {
}
type Signal struct {
RuleBase
Base
Qualifier
Access []string
Set []string
@ -49,7 +49,7 @@ func newSignal(q Qualifier, rule rule) (Rule, error) {
return nil, err
}
return &Signal{
RuleBase: newBase(rule),
Base: newBase(rule),
Qualifier: q,
Access: accesses,
Set: set,
@ -59,7 +59,7 @@ func newSignal(q Qualifier, rule rule) (Rule, error) {
func newSignalFromLog(log map[string]string) Rule {
return &Signal{
RuleBase: newBaseFromLog(log),
Base: newBaseFromLog(log),
Qualifier: newQualifierFromLog(log),
Access: Must(toAccess(SIGNAL, log["requested_mask"])),
Set: []string{log["signal"]},
@ -86,12 +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)
b := &r.RuleBase
return b.merge(o.RuleBase)
b := &r.Base
return b.merge(o.Base)
case r.Peer == o.Peer && compare(r.Access, o.Access) == 0:
r.Set = merge(r.Kind(), "set", r.Set, o.Set)
b := &r.RuleBase
return b.merge(o.RuleBase)
b := &r.Base
return b.merge(o.Base)
}
return false
}