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

10
pkg/aa/dbus.go
View file

@ -21,7 +21,7 @@ func init() {
}
type Dbus struct {
RuleBase
Base
Qualifier
Access []string
Bus string
@ -39,7 +39,7 @@ func newDbus(q Qualifier, rule rule) (Rule, error) {
return nil, err
}
return &Dbus{
RuleBase: newBase(rule),
Base: newBase(rule),
Qualifier: q,
Access: accesses,
Bus: rule.GetValuesAsString("bus"),
@ -61,7 +61,7 @@ func newDbusFromLog(log map[string]string) Rule {
peerName = log["name"]
}
return &Dbus{
RuleBase: newBaseFromLog(log),
Base: newBaseFromLog(log),
Qualifier: newQualifierFromLog(log),
Access: []string{log["mask"]},
Bus: log["bus"],
@ -120,8 +120,8 @@ func (r *Dbus) Merge(other Rule) bool {
r.Interface == o.Interface && r.Member == o.Member &&
r.PeerName == o.PeerName && r.PeerLabel == o.PeerLabel {
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)
}
return false
}