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

nmisch · nmisch · commit c22650cd6450 · 2016-04-01T21:53:18.000-04:00
This corrects messages for can't-happen errors.  The corresponding "user
token" appears in the HANDLE argument of GetTokenInformation().
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
@@ -1252,7 +1252,7 @@ pg_SSPI_recvauth(Port *port)
 
 	if (!GetTokenInformation(token, TokenUser, tokenuser, retlen, &retlen))
 		ereport(ERROR,
-				(errmsg_internal("could not get user token: error code %lu",
+				(errmsg_internal("could not get token user: error code %lu",
 								 GetLastError())));
 
 	CloseHandle(token);
diff --git a/src/common/exec.c b/src/common/exec.c
@@ -672,13 +672,10 @@ AddUserToTokenDacl(HANDLE hToken)
 		goto cleanup;
 	}
 
-	/*
-	 * Get the user token for the current user, which provides us with the SID
-	 * that is needed for creating the ACL.
-	 */
+	/* Get the current user SID */
 	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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -672,13 +672,10 @@ AddUserToTokenDacl(HANDLE hToken)`
`672`	`672`	`goto cleanup;`
`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 get user token: error code %lu", GetLastError());`
	`678`	`+ log_error("could not get token user: error code %lu", GetLastError());`
`682`	`679`	`goto cleanup;`
`683`	`680`	`}`
`684`	`681`