[PATCH 05/12] LookupAccountNameW() - correct call in SetEntriesInAclW()

Paul Bryan Roberts pbronline-wine at yahoo.co.uk
Sat Oct 18 14:56:08 CDT 2008


---
 dlls/advapi32/security.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 16393c6..62313a6 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -2537,7 +2537,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI
             domainName = ACCOUNT_SIDS[i].domain;
             nameLen = strlenW(domainName);
 
-            if (*cchReferencedDomainName <= nameLen && ReferencedDomainName)
+            if (*cchReferencedDomainName <= nameLen || !ret)
             {
                 SetLastError(ERROR_INSUFFICIENT_BUFFER);
                 nameLen += 1;
@@ -3240,7 +3240,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries,
         case TRUSTEE_IS_NAME:
         {
             DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]);
-            DWORD domain_size = 0;
+            DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1;
             SID_NAME_USE use;
             if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use))
             {
-- 
1.5.4.3


--------------060104080409080308090303--



More information about the wine-patches mailing list