Add inheritable ACE when creating a restricted token for execution on

Win32.

Also refactor the code around it to be more clear.

Jesse Morris

1 files changed, 5 insertions, 5 deletions

diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3f27dbfec17..330cd218943 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.64 2009/08/18 10:30:41 teodor Exp $
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.65 2009/11/14 15:39:36 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1021,6 +1021,10 @@ spawn_process(const char *cmdline)
 	cmdline2 = malloc(strlen(cmdline) + 8);
 	sprintf(cmdline2, "cmd /c %s", cmdline);
 
+#ifndef __CYGWIN__
+	AddUserToTokenDacl(restrictedToken);
+#endif
+
 	if (!CreateProcessAsUser(restrictedToken,
 							 NULL,
 							 cmdline2,
@@ -1038,10 +1042,6 @@ spawn_process(const char *cmdline)
 		exit_nicely(2);
 	}
 
-#ifndef __CYGWIN__
-	AddUserToDacl(pi.hProcess);
-#endif
-
 	free(cmdline2);
 
 	ResumeThread(pi.hThread);