Commitc22650c

committed

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

This corrects messages for can't-happen errors. The corresponding "usertoken" appears in the HANDLE argument of GetTokenInformation().

1 parent4ad6f13 commitc22650cCopy full SHA for c22650c

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1252,7 +1252,7 @@ pg_SSPI_recvauth(Port *port)`
`1252`	`1252`
`1253`	`1253`	`if (!GetTokenInformation(token,TokenUser,tokenuser,retlen,&retlen))`
`1254`	`1254`	`ereport(ERROR,`
`1255`		`-(errmsg_internal("could not getusertoken: error code %lu",`
	`1255`	`+(errmsg_internal("could not get token user: error code %lu",`
`1256`	`1256`	`GetLastError())));`
`1257`	`1257`
`1258`	`1258`	`CloseHandle(token);`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -672,13 +672,10 @@ AddUserToTokenDacl(HANDLE hToken)`
`672`	`672`	`gotocleanup;`
`673`	`673`	`}`
`674`	`674`
`675`		`-/*`
`676`		`- * Get the user token for the current user, which provides us with the SID`
`677`		`- * that is needed for creating the ACL.`
`678`		`- */`
	`675`	`+/* Get the current user SID */`
`679`	`676`	`if (!GetTokenUser(hToken,&pTokenUser))`
`680`	`677`	`{`
`681`		`-log_error("could not getusertoken: error code %lu",GetLastError());`
	`678`	`+log_error("could not get token user: error code %lu",GetLastError());`
`682`	`679`	`gotocleanup;`
`683`	`680`	`}`
`684`	`681`

Comments

(0)