summaryrefslogtreecommitdiff
path: root/src/common/exec.c
diff options
context:
space:
mode:
authorPavan Deolasee2016-10-27 15:02:55 +0000
committerPavan Deolasee2016-10-27 15:02:55 +0000
commitc52792488cd87e67e62ec61f5b56f461900353b4 (patch)
tree02b4a719f979659de8f73fce6c1ca65cef2e323f /src/common/exec.c
parent891e6be57e5580b54a9df9fd42cb9bd10d0e7b21 (diff)
parentb5bce6c1ec6061c8a4f730d927e162db7e2ce365 (diff)
Merge commit 'b5bce6c1ec6061c8a4f730d927e162db7e2ce365'
Diffstat (limited to 'src/common/exec.c')
-rw-r--r--src/common/exec.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/common/exec.c b/src/common/exec.c
index e5575d5f50..d736b02280 100644
--- a/src/common/exec.c
+++ b/src/common/exec.c
@@ -4,7 +4,7 @@
* Functions for finding and validating executable files
*
*
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
*
@@ -672,15 +672,9 @@ 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());
- goto cleanup;
- }
+ goto cleanup; /* callee printed a message */
/* Figure out the size of the new ACL */
dwNewAclSize = asi.AclBytesInUse + sizeof(ACCESS_ALLOWED_ACE) +