From 109aaee6593ac6e72d23b817e5b75292c2ed7bed Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 10 Oct 2025 03:19:09 +0900 Subject: internal/app: copy parts of config to state This is less error-prone than passing the address to the entire hst.Config struct, and reduces the likelihood of accidentally clobbering hst.Config. This also improves ease of testing. Signed-off-by: Ophestra --- internal/app/spdbus.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'internal/app/spdbus.go') diff --git a/internal/app/spdbus.go b/internal/app/spdbus.go index ac27eeb0..604450a0 100644 --- a/internal/app/spdbus.go +++ b/internal/app/spdbus.go @@ -19,26 +19,26 @@ type spDBusOp struct { } func (s *spDBusOp) toSystem(state *outcomeStateSys) error { - if state.config.Enablements.Unwrap()&hst.EDBus == 0 { + if state.et&hst.EDBus == 0 { return errNotEnabled } - if state.config.SessionBus == nil { - state.config.SessionBus = dbus.NewConfig(state.config.ID, true, true) + if state.sessionBus == nil { + state.sessionBus = dbus.NewConfig(state.appId, true, true) } // downstream socket paths sessionPath, systemPath := state.instance().Append("bus"), state.instance().Append("system_bus_socket") if err := state.sys.ProxyDBus( - state.config.SessionBus, state.config.SystemBus, + state.sessionBus, state.systemBus, sessionPath, systemPath, ); err != nil { return err } state.sys.UpdatePerm(sessionPath, acl.Read, acl.Write) - if state.config.SystemBus != nil { + if state.systemBus != nil { s.ProxySystem = true state.sys.UpdatePerm(systemPath, acl.Read, acl.Write) } -- cgit v1.3.1