Resolve merge conflicts from main

- login.go: keep both new imports (mdm + nbnet + server)
- ios/NetBirdSDK/client.go: additive struct-field merge (mdmLoader + stateMu/connectClient/config)
- setconfig_mdm_test.go: adopt new withMDMPolicy(t, s, policy) signature; fix stray old-signature call in TestSetConfig_MDMAllow_ManagementURLPortNormalized
This commit is contained in:
riccardom
2026-07-28 11:04:04 +02:00
parent e1ffb165a4
commit e92aa7dfb0
3 changed files with 3 additions and 18 deletions

View File

@@ -84,18 +84,16 @@ type Client struct {
// preloadedConfig holds config loaded from JSON (used on tvOS where file writes are blocked)
preloadedConfig *profilemanager.Config
<<<<<<< ours
// mdmLoader holds the per-Client MDM policy source. Set by
// SetMDMPolicyFetcher (called from the Swift side at extension
// init). Each Run passes this loader to the resolved Config so
// applyMDMPolicy picks up the active overlay. Nil means "MDM
// enforcement off for this Client".
mdmLoader *mdm.Loader
=======
stateMu sync.RWMutex
connectClient *internal.ConnectClient
config *profilemanager.Config
>>>>>>> theirs
}
// NewClient instantiate a new Client