*** pgsql/src/test/regress/pg_regress.c	2009/06/11 14:49:15	1.63
--- pgsql/src/test/regress/pg_regress.c	2009/11/14 15:39:45	1.63.2.1
***************
*** 11,17 ****
   * 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.62 2009/04/23 00:23:46 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 11,17 ----
   * 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.63 2009/06/11 14:49:15 momjian Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** spawn_process(const char *cmdline)
*** 1021,1026 ****
--- 1021,1030 ----
  	cmdline2 = malloc(strlen(cmdline) + 8);
  	sprintf(cmdline2, "cmd /c %s", cmdline);
  
+ #ifndef __CYGWIN__
+ 	AddUserToTokenDacl(restrictedToken);
+ #endif
+ 
  	if (!CreateProcessAsUser(restrictedToken,
  							 NULL,
  							 cmdline2,
*************** spawn_process(const char *cmdline)
*** 1038,1047 ****
  		exit_nicely(2);
  	}
  
- #ifndef __CYGWIN__
- 	AddUserToDacl(pi.hProcess);
- #endif
- 
  	free(cmdline2);
  
  	ResumeThread(pi.hThread);
--- 1042,1047 ----