tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Administrator non en-us OS. (#488)

This commit is contained in:
bagajjal 2021-03-25 14:25:42 -07:00 committed by GitHub
parent 2539e60536
commit 54824dd72e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/win32/win32compat/misc.c
View File

@ -1605,12 +1605,18 @@ get_sid(const char* name)
SID_NAME_USE n_use; SID_NAME_USE n_use;
WCHAR dom[DNLEN + 1] = L""; WCHAR dom[DNLEN + 1] = L"";
DWORD dom_len = DNLEN + 1; DWORD dom_len = DNLEN + 1;
BOOL resolveAsAdminsSid = 0, r;
if ((name_utf16 = utf8_to_utf16(name)) == NULL) if ((name_utf16 = utf8_to_utf16(name)) == NULL)
goto cleanup; goto cleanup;
LookupAccountNameW(NULL, name_utf16, NULL, &sid_len, dom, &dom_len, &n_use); LookupAccountNameW(NULL, name_utf16, NULL, &sid_len, dom, &dom_len, &n_use);
if (sid_len == 0 && _stricmp(name, "administrators") == 0) {
CreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, NULL, &sid_len);
resolveAsAdminsSid = 1;
}
if (sid_len == 0) { if (sid_len == 0) {
errno = errno_from_Win32LastError(); errno = errno_from_Win32LastError();
goto cleanup; goto cleanup;
@ -1621,7 +1627,12 @@ get_sid(const char* name)
goto cleanup; goto cleanup;
} }
if (!LookupAccountNameW(NULL, name_utf16, psid, &sid_len, dom, &dom_len, &n_use)) { if (resolveAsAdminsSid)
r = CreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, psid, &sid_len);
else
r = LookupAccountNameW(NULL, name_utf16, psid, &sid_len, dom, &dom_len, &n_use);
if (!r) {
errno = errno_from_Win32LastError(); errno = errno_from_Win32LastError();
goto cleanup; goto cleanup;
} }
@ -1669,6 +1680,7 @@ cleanup:
return ret; return ret;
} }
/* Interpret scp and sftp executables*/ /* Interpret scp and sftp executables*/
char * char *
build_exec_command(const char * command) build_exec_command(const char * command)