mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refer to a TOKEN_USER payload as a "token user," not as a "user token".

Browse Source 
This corrects messages for can't-happen errors.  The corresponding "user
token" appears in the HANDLE argument of GetTokenInformation().
This commit is contained in:
Noah Misch 2016-04-01 21:53:18 -04:00
parent 4ad6f13500
commit c22650cd64
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/libpq/auth.c
View File

@ -1252,7 +1252,7 @@ pg_SSPI_recvauth(Port *port)
if (!GetTokenInformation(token, TokenUser, tokenuser, retlen, &retlen)) if (!GetTokenInformation(token, TokenUser, tokenuser, retlen, &retlen))
ereport(ERROR, ereport(ERROR,
(errmsg_internal("could not get user token: error code %lu", (errmsg_internal("could not get token user: error code %lu",
GetLastError()))); GetLastError())));
CloseHandle(token); CloseHandle(token);

7
src/common/exec.c
View File

@ -672,13 +672,10 @@ AddUserToTokenDacl(HANDLE hToken)
goto cleanup; goto cleanup;
} }
/* /* Get the current user SID */
* Get the user token for the current user, which provides us with the SID
* that is needed for creating the ACL.
*/
if (!GetTokenUser(hToken, &pTokenUser)) if (!GetTokenUser(hToken, &pTokenUser))
{ {
log_error("could not get user token: error code %lu", GetLastError()); log_error("could not get token user: error code %lu", GetLastError());
goto cleanup; goto cleanup;
} }