diff --git a/client/mdm/policy.go b/client/mdm/policy.go index 919eae9bc..1e7768866 100644 --- a/client/mdm/policy.go +++ b/client/mdm/policy.go @@ -20,7 +20,6 @@ import ( // configuration field. const ( KeyManagementURL = "managementURL" - KeyDisableAdvancedSettings = "disableAdvancedSettings" KeyDisableUpdateSettings = "disableUpdateSettings" KeyDisableProfiles = "disableProfiles" KeyDisableNetworks = "disableNetworks" @@ -54,7 +53,6 @@ const ( // configuration are ignored but logged. var AllKeys = []string{ KeyManagementURL, - KeyDisableAdvancedSettings, KeyDisableUpdateSettings, KeyDisableProfiles, KeyDisableNetworks, diff --git a/client/server/server.go b/client/server/server.go index 0e3f5d810..c06b05c26 100644 --- a/client/server/server.go +++ b/client/server/server.go @@ -1702,16 +1702,6 @@ func (s *Server) GetFeatures(ctx context.Context, msg *proto.GetFeaturesRequest) DisableNetworks: s.checkNetworksDisabled(), } - // MDM kill switch: read the value from the active policy on the - // in-memory Config snapshot. Returns false on an absent key, so the - // feature flag is only "true" when the admin has explicitly pushed - // disableAdvancedSettings=true via the platform MDM channel. - if s.config != nil { - if v, ok := s.config.Policy().GetBool(mdm.KeyDisableAdvancedSettings); ok { - features.DisableAdvancedSettings = v - } - } - return features, nil }