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 "user
token" appears in the HANDLE argument of GetTokenInformation().

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 899da712f7ad7ab609a4298460f0e0d8a8a50467..2751183c3e694dac307344ed08e6c75682b1bdd2 100644 (file)
--- 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
index 927d03c3b7594badfafad7cc41a8a7666f46e2cd..ec8c655636540ad412fceb10c0e7d2ceae8e916a 100644 (file)
--- 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;
        }