aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBevan Weiss <bevan.weiss@gmail.com>2025-02-27 22:16:51 +1100
committerBob Arnson <github@bobs.org>2025-02-28 19:57:16 -0500
commit988d1d497411bc515bc0a032c07cc0713f985200 (patch)
tree5ab870964370fb96af88edf72a9c2ab54899e613 /src
parent1be4e0930eb296f44b8cecd10fc9632a867149ce (diff)
downloadwix-988d1d497411bc515bc0a032c07cc0713f985200.tar.gz
wix-988d1d497411bc515bc0a032c07cc0713f985200.tar.bz2
wix-988d1d497411bc515bc0a032c07cc0713f985200.zip
util: correct usage of NetLocalGroupGetInfo in GroupExecute
Microsoft documentation doesn't list Level 0 as being a valid group info level to request for NetLocalGroupGetInfo. So we should only be requesting Level 1 instead. Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/ext/Util/ca/scagroup.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ext/Util/ca/scagroup.cpp b/src/ext/Util/ca/scagroup.cpp
index 666100b0..6d67ffa4 100644
--- a/src/ext/Util/ca/scagroup.cpp
+++ b/src/ext/Util/ca/scagroup.cpp
@@ -427,7 +427,7 @@ HRESULT ScaGroupExecute(
427 LPWSTR pwzBaseScriptKey = NULL; 427 LPWSTR pwzBaseScriptKey = NULL;
428 DWORD cScriptKey = 0; 428 DWORD cScriptKey = 0;
429 429
430 LOCALGROUP_INFO_0 *pGroupInfo = NULL; 430 LOCALGROUP_INFO_1 *pGroupInfo1 = NULL;
431 LPWSTR pwzScriptKey = NULL; 431 LPWSTR pwzScriptKey = NULL;
432 LPWSTR pwzActionData = NULL; 432 LPWSTR pwzActionData = NULL;
433 LPWSTR pwzRollbackData = NULL; 433 LPWSTR pwzRollbackData = NULL;
@@ -472,7 +472,7 @@ HRESULT ScaGroupExecute(
472 } 472 }
473 } 473 }
474 474
475 er = ::NetLocalGroupGetInfo(pwzServerName, psg->wzName, 0, reinterpret_cast<LPBYTE*>(&pGroupInfo)); 475 er = ::NetLocalGroupGetInfo(pwzServerName, psg->wzName, 1, reinterpret_cast<LPBYTE*>(&pGroupInfo1));
476 if (NERR_Success == er) 476 if (NERR_Success == er)
477 { 477 {
478 geGroupExists = GROUP_EXISTS_YES; 478 geGroupExists = GROUP_EXISTS_YES;
@@ -614,10 +614,10 @@ HRESULT ScaGroupExecute(
614 ReleaseNullStr(pwzActionData); 614 ReleaseNullStr(pwzActionData);
615 ReleaseNullStr(pwzRollbackData); 615 ReleaseNullStr(pwzRollbackData);
616 ReleaseNullStr(pwzServerName); 616 ReleaseNullStr(pwzServerName);
617 if (pGroupInfo) 617 if (pGroupInfo1)
618 { 618 {
619 ::NetApiBufferFree(static_cast<LPVOID>(pGroupInfo)); 619 ::NetApiBufferFree(static_cast<LPVOID>(pGroupInfo1));
620 pGroupInfo = NULL; 620 pGroupInfo1 = NULL;
621 } 621 }
622 } 622 }
623 623
@@ -627,10 +627,10 @@ LExit:
627 ReleaseStr(pwzActionData); 627 ReleaseStr(pwzActionData);
628 ReleaseStr(pwzRollbackData); 628 ReleaseStr(pwzRollbackData);
629 ReleaseStr(pwzServerName); 629 ReleaseStr(pwzServerName);
630 if (pGroupInfo) 630 if (pGroupInfo1)
631 { 631 {
632 ::NetApiBufferFree(static_cast<LPVOID>(pGroupInfo)); 632 ::NetApiBufferFree(static_cast<LPVOID>(pGroupInfo1));
633 pGroupInfo = NULL; 633 pGroupInfo1 = NULL;
634 } 634 }
635 635
636 return hr; 636 return hr;