Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Windows Var Replacement: use updated profile contents instead of incoming (#34681)

Browse source 
This fixes a bug, but also fixes the flaky test runs seen in
[Slack](https://fleetdm.slack.com/archives/C019WG4GH0A/p1761192670589249).
This commit is contained in:
Magnus Jensen 2025-10-23 10:04:24 -03:00 committed by GitHub
parent 92bf89f235
commit 5105e1914b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/mdm/microsoft/profile_verifier.go
View file

@ -353,7 +353,7 @@ func preprocessWindowsProfileContents(ctx context.Context, logger kitlog.Logger,
if fleetVar == string(fleet.FleetVarHostUUID) {
result = profiles.ReplaceFleetVariableInXML(fleet.FleetVarHostUUIDRegexp, result, hostUUID)
} else if fleetVar == string(fleet.FleetVarHostEndUserEmailIDP) {
replacedContents, replacedVariable, err := profiles.ReplaceHostEndUserEmailIDPVariable(ctx, ds, profileContents, hostUUID)
replacedContents, replacedVariable, err := profiles.ReplaceHostEndUserEmailIDPVariable(ctx, ds, result, hostUUID)
if err != nil {
return profileContents, ctxerr.Wrap(ctx, err, "replacing host end user email IDP variable")
}