Group Add/Remove working.

Local group membership Add/Remove working, however with
BUILTIN local system groups .NET doesn't appear to locate them as either
groups nor basic security Principals.  Still needs work to fix the test
for nested groups.  Ideally with some way to test for domain groups.


Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/ext/Util/ca/scanet.cpp b/src/ext/Util/ca/scanet.cpp
index 11ee487d..a8ad0316 100644
--- a/src/ext/Util/ca/scanet.cpp
+++ b/src/ext/Util/ca/scanet.cpp
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 #include "precomp.h"
-#include "scanet.h"
 
 
 HRESULT GetDomainServerName(LPCWSTR pwzDomain, LPWSTR* ppwzServerName, ULONG flags)
@@ -25,16 +24,16 @@ HRESULT GetDomainServerName(LPCWSTR pwzDomain, LPWSTR* ppwzServerName, ULONG fla
             if ('\\' == *pDomainControllerInfo->DomainControllerName && '\\' == *pDomainControllerInfo->DomainControllerName + 1)
             {
                 hr = StrAllocString(ppwzServerName, pDomainControllerInfo->DomainControllerName + 2, 0);
-                ExitOnFailure(hr, "failed to allocate memory for string");
             }
             else
             {
                 hr = StrAllocString(ppwzServerName, pDomainControllerInfo->DomainControllerName, 0);
-                ExitOnFailure(hr, "failed to allocate memory for string");
             }
+            ExitOnFailure(hr, "failed to allocate memory for string");
         }
         else
         {
+            // we won't report any potential string allocation failure, the domain failure is more interesting
             StrAllocString(ppwzServerName, pwzDomain, 0);
             hr = HRESULT_FROM_WIN32(er);
             ExitOnFailure(hr, "failed to contact domain %ls", pwzDomain);