summaryrefslogtreecommitdiff
path: root/src/ext/Util/ca/scaexec.cpp
diff options
context:
space:
mode:
authorBevan Weiss <bevan.weiss@gmail.com>2025-01-03 15:06:15 +1100
committerRob Mensching <rob@firegiant.com>2025-02-11 23:14:49 -0800
commit8f5130afdc60f4957086e41d62cfe9f8d70d5321 (patch)
treeda9f8a9d217eff1484bf78003d52624d1f91433b /src/ext/Util/ca/scaexec.cpp
parentfcae786168ee7c148ac932d725357f9714ad6631 (diff)
downloadwix-8f5130afdc60f4957086e41d62cfe9f8d70d5321.tar.gz
wix-8f5130afdc60f4957086e41d62cfe9f8d70d5321.tar.bz2
wix-8f5130afdc60f4957086e41d62cfe9f8d70d5321.zip
Fix ups for Domain Group creation / removal.
Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
Diffstat (limited to 'src/ext/Util/ca/scaexec.cpp')
-rw-r--r--src/ext/Util/ca/scaexec.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ext/Util/ca/scaexec.cpp b/src/ext/Util/ca/scaexec.cpp
index a2ecdaab..ee3c164f 100644
--- a/src/ext/Util/ca/scaexec.cpp
+++ b/src/ext/Util/ca/scaexec.cpp
@@ -716,7 +716,7 @@ static HRESULT RemoveGroupInternal(
716 // 716 //
717 if (!(SCAG_DONT_CREATE_GROUP & iAttributes)) 717 if (!(SCAG_DONT_CREATE_GROUP & iAttributes))
718 { 718 {
719 hr = GetDomainFromServerName(&pwzServerName, wzDomain, DS_WRITABLE_REQUIRED); 719 hr = GetDomainServerName(wzDomain, &pwzServerName, DS_WRITABLE_REQUIRED);
720 720
721 NET_API_STATUS er = ::NetLocalGroupDel(pwzServerName, wzName); 721 NET_API_STATUS er = ::NetLocalGroupDel(pwzServerName, wzName);
722 hr = HRESULT_FROM_WIN32(er); 722 hr = HRESULT_FROM_WIN32(er);
@@ -1284,7 +1284,7 @@ extern "C" UINT __stdcall CreateGroup(
1284 1284
1285 if (!(SCAG_DONT_CREATE_GROUP & iAttributes)) 1285 if (!(SCAG_DONT_CREATE_GROUP & iAttributes))
1286 { 1286 {
1287 hr = GetDomainFromServerName(&pwzServerName, pwzDomain, DS_WRITABLE_REQUIRED); 1287 hr = GetDomainServerName(pwzDomain, &pwzServerName, DS_WRITABLE_REQUIRED);
1288 ExitOnFailure(hr, "failed to find writable server for domain %ls.", pwzDomain); 1288 ExitOnFailure(hr, "failed to find writable server for domain %ls.", pwzDomain);
1289 1289
1290 // Set the group's comment 1290 // Set the group's comment
@@ -1680,7 +1680,7 @@ HRESULT AlterGroupMembership(BOOL fRemove, BOOL fIsRollback)
1680 } 1680 }
1681 1681
1682 1682
1683 hr = GetDomainFromServerName(&pwzServerName, pwzParentDomain, DS_WRITABLE_REQUIRED); 1683 hr = GetDomainServerName(pwzParentDomain, &pwzServerName, DS_WRITABLE_REQUIRED);
1684 ExitOnFailure(hr, "failed to obtain writable server for domain %ls", pwzParentDomain); 1684 ExitOnFailure(hr, "failed to obtain writable server for domain %ls", pwzParentDomain);
1685 1685
1686 if (*pwzChildDomain) 1686 if (*pwzChildDomain)