Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MinGW: use nameless unions in ext_ad_group_acl #2004

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

MinGW: use nameless unions in ext_ad_group_acl #2004

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87083ad
mingw: use namleess unions in ext_ad_group_acl
kinkie Feb 27, 2025
48f53e8
Stop leaking BSTRs
kinkie Feb 27, 2025
c2524b2
Use SysAllocString instead of direct BSTR
kinkie Feb 28, 2025
51206a9
do not leak memory
kinkie Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 32 additions & 28 deletions src/acl/external/AD_group/ext_ad_group_acl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ GetLPBYTEtoOctetString(VARIANT * pVar, LPBYTE * ppByte)

if ((!pVar) || (!ppByte))
return E_INVALIDARG;
if ((pVar->n1.n2.vt) != (VT_UI1 | VT_ARRAY))
if ((pVar->vt) != (VT_UI1 | VT_ARRAY))
return E_INVALIDARG;

hr = SafeArrayGetLBound(V_ARRAY(pVar), 1, &lLBound);
Expand Down Expand Up @@ -181,9 +181,10 @@ Get_primaryGroup(IADs * pUser)
VariantInit(&var);

/* Get the primaryGroupID property */
hr = pUser->lpVtbl->Get(pUser, L"primaryGroupID", &var);
static const auto primaryGroupIDStr = SysAllocString(L"primaryGroupID");
hr = pUser->Get(primaryGroupIDStr, &var);
if (SUCCEEDED(hr)) {
User_primaryGroupID = var.n1.n2.n3.uintVal;
User_primaryGroupID = var.uintVal;
} else {
debug("Get_primaryGroup: cannot get primaryGroupID, ERROR: %s\n", Get_WIN32_ErrorMessage(hr));
VariantClear(&var);
Expand All @@ -192,7 +193,8 @@ Get_primaryGroup(IADs * pUser)
VariantClear(&var);

/*Get the objectSid property */
hr = pUser->lpVtbl->Get(pUser, L"objectSid", &var);
static const auto objectSidStr = SysAllocString(L"objectSid");
hr = pUser->Get(objectSidStr, &var);
if (SUCCEEDED(hr)) {
PSID pObjectSID;
LPBYTE pByte = nullptr;
Expand Down Expand Up @@ -245,7 +247,6 @@ My_NameTranslate(wchar_t * name, int in_format, int out_format)
{
IADsNameTranslate *pNto;
HRESULT hr;
BSTR bstr;
wchar_t *wc;

if (WIN32_COM_initialized == 0) {
Expand All @@ -267,31 +268,33 @@ My_NameTranslate(wchar_t * name, int in_format, int out_format)
/* This is a fatal error */
exit(EXIT_FAILURE);
}
hr = pNto->lpVtbl->Init(pNto, ADS_NAME_INITTYPE_GC, L"");
static const auto emtpyStr = SysAllocString(L"");
hr = pNto->Init(ADS_NAME_INITTYPE_GC, emtpyStr);
if (FAILED(hr)) {
debug("My_NameTranslate: cannot initialise NameTranslate API, ERROR: %s\n", Get_WIN32_ErrorMessage(hr));
pNto->lpVtbl->Release(pNto);
pNto->Release();
/* This is a fatal error */
exit(EXIT_FAILURE);
}
hr = pNto->lpVtbl->Set(pNto, in_format, name);
hr = pNto->Set(in_format, name);
if (FAILED(hr)) {
debug("My_NameTranslate: cannot set translate of %S, ERROR: %s\n", name, Get_WIN32_ErrorMessage(hr));
pNto->lpVtbl->Release(pNto);
pNto->Release();
return nullptr;
}
hr = pNto->lpVtbl->Get(pNto, out_format, &bstr);
BSTR bstr;
hr = pNto->Get(out_format, &bstr);
if (FAILED(hr)) {
debug("My_NameTranslate: cannot get translate of %S, ERROR: %s\n", name, Get_WIN32_ErrorMessage(hr));
pNto->lpVtbl->Release(pNto);
pNto->Release();
return nullptr;
}
debug("My_NameTranslate: %S translated to %S\n", name, bstr);

wc = (wchar_t *) xmalloc((wcslen(bstr) + 1) * sizeof(wchar_t));
wcscpy(wc, bstr);
SysFreeString(bstr);
pNto->lpVtbl->Release(pNto);
pNto->Release();
return wc;
}

Expand Down Expand Up @@ -424,24 +427,25 @@ Recursive_Memberof(IADs * pObj)
HRESULT hr;

VariantInit(&var);
hr = pObj->lpVtbl->Get(pObj, L"memberOf", &var);
static const auto memberOfStr = SysAllocString(L"memberOf");
hr = pObj->Get(memberOfStr, &var);
if (SUCCEEDED(hr)) {
if (VT_BSTR == var.n1.n2.vt) {
if (add_User_Group(var.n1.n2.n3.bstrVal)) {
if (VT_BSTR == var.vt) {
if (add_User_Group(var.bstrVal)) {
wchar_t *Group_Path;
IADs *pGrp;

Group_Path = GetLDAPPath(var.n1.n2.n3.bstrVal, GC_MODE);
Group_Path = GetLDAPPath(var.bstrVal, GC_MODE);
hr = ADsGetObject(Group_Path, &IID_IADs, (void **) &pGrp);
if (SUCCEEDED(hr)) {
hr = Recursive_Memberof(pGrp);
pGrp->lpVtbl->Release(pGrp);
pGrp->Release();
safe_free(Group_Path);
Group_Path = GetLDAPPath(var.n1.n2.n3.bstrVal, LDAP_MODE);
Group_Path = GetLDAPPath(var.bstrVal, LDAP_MODE);
hr = ADsGetObject(Group_Path, &IID_IADs, (void **) &pGrp);
if (SUCCEEDED(hr)) {
hr = Recursive_Memberof(pGrp);
pGrp->lpVtbl->Release(pGrp);
pGrp->Release();
} else
debug("Recursive_Memberof: ERROR ADsGetObject for %S failed: %s\n", Group_Path, Get_WIN32_ErrorMessage(hr));
} else
Expand All @@ -455,21 +459,21 @@ Recursive_Memberof(IADs * pObj)
while (lBound <= uBound) {
hr = SafeArrayGetElement(V_ARRAY(&var), &lBound, &elem);
if (SUCCEEDED(hr)) {
if (add_User_Group(elem.n1.n2.n3.bstrVal)) {
if (add_User_Group(elem.bstrVal)) {
wchar_t *Group_Path;
IADs *pGrp;

Group_Path = GetLDAPPath(elem.n1.n2.n3.bstrVal, GC_MODE);
Group_Path = GetLDAPPath(elem.bstrVal, GC_MODE);
hr = ADsGetObject(Group_Path, &IID_IADs, (void **) &pGrp);
if (SUCCEEDED(hr)) {
hr = Recursive_Memberof(pGrp);
pGrp->lpVtbl->Release(pGrp);
pGrp->Release();
safe_free(Group_Path);
Group_Path = GetLDAPPath(elem.n1.n2.n3.bstrVal, LDAP_MODE);
Group_Path = GetLDAPPath(elem.bstrVal, LDAP_MODE);
hr = ADsGetObject(Group_Path, &IID_IADs, (void **) &pGrp);
if (SUCCEEDED(hr)) {
hr = Recursive_Memberof(pGrp);
pGrp->lpVtbl->Release(pGrp);
pGrp->Release();
safe_free(Group_Path);
} else
debug("Recursive_Memberof: ERROR ADsGetObject for %S failed: %s\n", Group_Path, Get_WIN32_ErrorMessage(hr));
Expand Down Expand Up @@ -680,27 +684,27 @@ Valid_Global_Groups(char *UserName, const char **Groups)
hr = ADsGetObject(User_PrimaryGroup_Path, &IID_IADs, (void **) &pGrp);
if (SUCCEEDED(hr)) {
hr = Recursive_Memberof(pGrp);
pGrp->lpVtbl->Release(pGrp);
pGrp->Release();
safe_free(User_PrimaryGroup_Path);
User_PrimaryGroup_Path = GetLDAPPath(User_PrimaryGroup, LDAP_MODE);
hr = ADsGetObject(User_PrimaryGroup_Path, &IID_IADs, (void **) &pGrp);
if (SUCCEEDED(hr)) {
hr = Recursive_Memberof(pGrp);
pGrp->lpVtbl->Release(pGrp);
pGrp->Release();
} else
debug("Valid_Global_Groups: ADsGetObject for %S failed, ERROR: %s\n", User_PrimaryGroup_Path, Get_WIN32_ErrorMessage(hr));
} else
debug("Valid_Global_Groups: ADsGetObject for %S failed, ERROR: %s\n", User_PrimaryGroup_Path, Get_WIN32_ErrorMessage(hr));
safe_free(User_PrimaryGroup_Path);
}
hr = Recursive_Memberof(pUser);
pUser->lpVtbl->Release(pUser);
pUser->Release();
safe_free(User_LDAP_path);
User_LDAP_path = GetLDAPPath(User_DN, LDAP_MODE);
hr = ADsGetObject(User_LDAP_path, &IID_IADs, (void **) &pUser);
if (SUCCEEDED(hr)) {
hr = Recursive_Memberof(pUser);
pUser->lpVtbl->Release(pUser);
pUser->Release();
} else
debug("Valid_Global_Groups: ADsGetObject for %S failed, ERROR: %s\n", User_LDAP_path, Get_WIN32_ErrorMessage(hr));

Expand Down