chore: properly use DefaultIfEmpty consistently

SpecterOps · Jul 22, 2024 · bb2abb2 · bb2abb2
1 parent ec85996
commit bb2abb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/CommonLib/LdapUtils.cs b/src/CommonLib/LdapUtils.cs
@@ -1303,8 +1303,8 @@ public async Task<bool> IsDomainController(string computerObjectId, string domai
                 DomainName = resDomain,
                 Attributes = CommonProperties.ObjectID,
                 LDAPFilter = filter.GetFilter(),
-            }).DefaultIfEmpty(null).FirstOrDefaultAsync();
-            return result is { IsSuccess: true };
+            }).DefaultIfEmpty(LdapResult<IDirectoryObject>.Fail()).FirstOrDefaultAsync();
+            return result.IsSuccess;
         }
 
         public async Task<(bool Success, TypedPrincipal Principal)> ResolveDistinguishedName(string distinguishedName) {

diff --git a/src/CommonLib/Processors/GPOLocalGroupProcessor.cs b/src/CommonLib/Processors/GPOLocalGroupProcessor.cs
@@ -120,9 +120,9 @@ public async Task<ResultingGPOChanges> ReadGPOLocalGroups(string gpLink, string
                         SearchScope = SearchScope.Base,
                         Attributes = CommonProperties.GPCFileSysPath,
                         SearchBase = linkDn
-                    }).DefaultIfEmpty(null).FirstOrDefaultAsync();
+                    }).DefaultIfEmpty(LdapResult<IDirectoryObject>.Fail()).FirstOrDefaultAsync();
 
-                    if (result is not { IsSuccess: true }) {
+                    if (!result.IsSuccess) {
                         continue;
                     }