Merge branch 'v4' into kstrader/BED-5004

SpecterOps · Nov 25, 2024 · 5679a78 · 5679a78
2 parents e90a3de + c953260
commit 5679a78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/CommonLib/LdapProducerQueryGenerator.cs b/src/CommonLib/LdapProducerQueryGenerator.cs
@@ -59,11 +59,6 @@ public static GeneratedLdapParameters GenerateDefaultPartitionParameters(Collect
             };
         }
 
-        if (methods.HasFlag(CollectionMethod.Group)) {
-            filter = filter.AddGroups();
-            properties.AddRange(CommonProperties.GroupResolutionProps);
-        }
-
         if (methods.IsComputerCollectionSet()) {
             filter = filter.AddComputers();
             properties.AddRange(CommonProperties.ComputerMethodProps);
@@ -89,6 +84,11 @@ public static GeneratedLdapParameters GenerateDefaultPartitionParameters(Collect
             properties.AddRange(CommonProperties.ComputerMethodProps);
         }
 
+        if (methods.HasFlag(CollectionMethod.Group)) {
+            filter = filter.AddGroups();
+            properties.AddRange(CommonProperties.GroupResolutionProps);
+        }
+
         return new GeneratedLdapParameters {
             Filter = filter,
             Attributes = properties.Distinct().ToArray()

diff --git a/src/CommonLib/SharpHoundCommonLib.csproj b/src/CommonLib/SharpHoundCommonLib.csproj
@@ -9,7 +9,7 @@
         <PackageDescription>Common library for C# BloodHound enumeration tasks</PackageDescription>
         <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/BloodHoundAD/SharpHoundCommon</RepositoryUrl>
-        <Version>4.0.8</Version>
+        <Version>4.0.9</Version>
         <AssemblyName>SharpHoundCommonLib</AssemblyName>
         <RootNamespace>SharpHoundCommonLib</RootNamespace>
     </PropertyGroup>