-
Notifications
You must be signed in to change notification settings - Fork 270
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix faulty memory access in Util's User custom actions
Generally, clean up the handling of getting the domain from a server name by centralizing and simplifying it behind an improved GetDomainFromServerName() based on the buggy GetServerName(). Fixes 8576
- Loading branch information
Showing
5 changed files
with
95 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,59 @@ | ||
| // 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" | ||
|
|
||
| HRESULT GetDomainFromServerName( | ||
| __deref_out_z LPWSTR* ppwzDomainName, | ||
| __in_z LPCWSTR wzServerName, | ||
| __in DWORD dwFlags | ||
| ) | ||
| { | ||
| HRESULT hr = S_OK; | ||
| DWORD er = ERROR_SUCCESS; | ||
| PDOMAIN_CONTROLLER_INFOW pDomainControllerInfo = NULL; | ||
| LPCWSTR wz = wzServerName ? wzServerName : L""; // initialize the domain to the provided server name (or empty string). | ||
|
|
||
| // If the server name was not empty, try to get the domain name out of it. | ||
| if (*wz) | ||
| { | ||
| er = ::DsGetDcNameW(NULL, wz, NULL, NULL, dwFlags, &pDomainControllerInfo); | ||
| if (RPC_S_SERVER_UNAVAILABLE == er) | ||
| { | ||
| // MSDN says, if we get the above error code, try again with the "DS_FORCE_REDISCOVERY" flag. | ||
| er = ::DsGetDcNameW(NULL, wz, NULL, NULL, dwFlags | DS_FORCE_REDISCOVERY, &pDomainControllerInfo); | ||
| } | ||
| ExitOnWin32Error(er, hr, "Could not get domain name from server name: %ls", wz); | ||
|
|
||
| if (pDomainControllerInfo->DomainControllerName) | ||
| { | ||
| // Skip the \\ prefix if present. | ||
| if ('\\' == *pDomainControllerInfo->DomainControllerName && '\\' == *(pDomainControllerInfo->DomainControllerName + 1)) | ||
| { | ||
| wz = pDomainControllerInfo->DomainControllerName + 2; | ||
| } | ||
| else | ||
| { | ||
| wz = pDomainControllerInfo->DomainControllerName; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| LExit: | ||
| // Note: we overwrite the error code here as failure to contact domain controller above is not a fatal error. | ||
| if (wz && *wz) | ||
| { | ||
| hr = StrAllocString(ppwzDomainName, wz, 0); | ||
| } | ||
| else // return NULL the server name ended up empty. | ||
| { | ||
| ReleaseNullStr(*ppwzDomainName); | ||
| hr = S_OK; | ||
| } | ||
|
|
||
| if (pDomainControllerInfo) | ||
| { | ||
| ::NetApiBufferFree((LPVOID)pDomainControllerInfo); | ||
| } | ||
|
|
||
| return hr; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| #pragma once | ||
| // 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. | ||
|
|
||
| HRESULT GetDomainFromServerName( | ||
| __deref_out_z LPWSTR* ppwzDomainName, | ||
| __in_z LPCWSTR wzServerName, | ||
| __in DWORD dwFlags | ||
| ); |