From: Pierre Joye <pajoye@php.net>
Date: Wed, 2 Sep 2009 01:59:17 +0000 (+0000)
Subject: - #27051, we need the thread token here, not the process
X-Git-Tag: php-5.3.1RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da9aee970329e083ee3adfd0df94e6f92acdffba;p=php

- #27051, we need the thread token here, not the process
---

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 9cf1fa44ae..c96ffb687d 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -316,6 +316,8 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	char *cmd;
 	int i;
 	char *ptype = (char *)type;
+	HANDLE thread_token = NULL;
+	HANDLE token_user = NULL;
 	TSRMLS_FETCH();
 
 	if (!type) {
@@ -368,14 +370,16 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		dwCreateFlags |= CREATE_NO_WINDOW;
 	}
 
+	/* Get a token with the impersonated user. */
+	if(OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
+		DuplicateTokenEx(thread_token, MAXIMUM_ALLOWED, &security, SecurityImpersonation, TokenPrimary, &token_user);
+	}
+
 	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
 	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
 
-	if(TWG(impersonation_token) == NULL) {
-		res = CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
-	} else {
-		res = CreateProcessAsUser(TWG(impersonation_token), NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
-	}
+	res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
+	CloseHandle(token_user);
 	free(cmd);
 
 	if (!res) {