From: Pierre Joye <pajoye@php.net>
Date: Thu, 3 Sep 2009 19:16:17 +0000 (+0000)
Subject: - #27051, improve fix on xp/2k3
X-Git-Tag: php-5.4.0alpha1~191^2~2700
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f59833828a4c03e4f9366b3f6788bb109bdc213;p=php

- #27051, improve fix on xp/2k3
---

diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 7389665b9e..d8d4214b91 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -319,6 +319,8 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	char *ptype = (char *)type;
 	HANDLE thread_token = NULL;
 	HANDLE token_user = NULL;
+	BOOL asuser = FALSE;
+
 	TSRMLS_FETCH();
 
 	if (!type) {
@@ -374,13 +376,22 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	/* 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);
+	} else {
+		DWORD err = GetLastError();
+		if (err == ERROR_NO_TOKEN) {
+			asuser = FALSE;
+		}
+
 	}
 
 	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
 	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
-
-	res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
-	CloseHandle(token_user);
+	if (asuser) {
+		res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
+		CloseHandle(token_user);
+	} else {
+		res = CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
+	}
 	free(cmd);
 
 	if (!res) {