Merge pull request #1026 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1

@@ -81,26 +81,28 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
     }
 
     # Use custom name if provided, otherwise use default for backward compatibility
-    $PolicyName = if ($Settings.name) { $Settings.name } else { 'CIPP Default Malware Policy' }
-    $PolicyList = @($PolicyName, 'CIPP Default Malware Policy', 'Default Malware Policy')
-    $ExistingPolicy = $AllMalwareFilterPolicies | Where-Object -Property Name -In $PolicyList | Select-Object -First 1
-    if ($null -eq $ExistingPolicy.Name) {
-        # No existing policy - use the configured/default name
-        $PolicyName = if ($Settings.name) { $Settings.name } else { 'CIPP Default Malware Policy' }
-    } else {
-        # Use existing policy name if found
-        $PolicyName = $ExistingPolicy.Name
+    $DefaultPolicyName = 'CIPP Default Malware Policy'
+    $PolicyName = if ($Settings.name) { $Settings.name } else { $DefaultPolicyName }
+    # Only match against legacy/default names when no custom name is provided. When a custom
+    # name is set, deploy it as a new policy instead of reusing an existing default-named one.
+    if ($PolicyName -eq $DefaultPolicyName) {
+        $PolicyList = @($PolicyName, 'Default Malware Policy')
+        $ExistingPolicy = $AllMalwareFilterPolicies | Where-Object -Property Name -In $PolicyList | Select-Object -First 1
+        if ($null -ne $ExistingPolicy.Name) {
+            # Use existing policy name if found
+            $PolicyName = $ExistingPolicy.Name
+        }
     }
-    # Derive rule name from policy name, but check for old names for backward compatibility
+    # Derive rule name from policy name. Only check legacy names when using the default policy name.
     $DesiredRuleName = "$PolicyName Rule"
-    $RuleList = @($DesiredRuleName, 'CIPP Default Malware Rule', 'CIPP Default Malware Policy')
-    $ExistingRule = $AllMalwareFilterRules | Where-Object -Property Name -In $RuleList | Select-Object -First 1
-    if ($null -eq $ExistingRule.Name) {
-        # No existing rule - use the derived name
-        $RuleName = $DesiredRuleName
-    } else {
-        # Use existing rule name if found
-        $RuleName = $ExistingRule.Name
+    $RuleName = $DesiredRuleName
+    if ($PolicyName -eq $DefaultPolicyName) {
+        $RuleList = @($DesiredRuleName, 'CIPP Default Malware Rule', 'CIPP Default Malware Policy')
+        $ExistingRule = $AllMalwareFilterRules | Where-Object -Property Name -In $RuleList | Select-Object -First 1
+        if ($null -ne $ExistingRule.Name) {
+            # Use existing rule name if found
+            $RuleName = $ExistingRule.Name
+        }
     }
 
     $CurrentState = $AllMalwareFilterPolicies |