Don't call AddUserToDacl on Cygwin

adunstan · adunstan · commit da956ae76fa0 · 2008-02-29T23:31:42.000Z
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.152.2.1 2008/02/29 15:31:40 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.152.2.2 2008/02/29 23:31:42 adunstan Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2349,7 +2349,9 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
 		return 0;
 	}
 
+#ifndef __CYGWIN__
 	AddUserToDacl(processInfo->hProcess);
+#endif
 
 	return ResumeThread(processInfo->hThread);
 }
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.92.2.2 2008/02/29 15:31:40 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.92.2.3 2008/02/29 23:31:42 adunstan Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1471,7 +1471,9 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
 		}
 	}
 
+#ifndef __CYGWIN__
     AddUserToDacl(processInfo->hProcess);
+#endif
     
 	CloseHandle(restrictedToken);
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.152.2.1 2008/02/29 15:31:40 mha Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.152.2.2 2008/02/29 23:31:42 adunstan Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -2349,7 +2349,9 @@ CreateRestrictedProcess(char cmd, PROCESS_INFORMATION processInfo)`
`2349`	`2349`	`return 0;`
`2350`	`2350`	`}`
`2351`	`2351`
	`2352`	`+#ifndef __CYGWIN__`
`2352`	`2353`	`AddUserToDacl(processInfo->hProcess);`
	`2354`	`+#endif`
`2353`	`2355`
`2354`	`2356`	`return ResumeThread(processInfo->hThread);`
`2355`	`2357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.92.2.2 2008/02/29 15:31:40 mha Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.92.2.3 2008/02/29 23:31:42 adunstan Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -1471,7 +1471,9 @@ CreateRestrictedProcess(char cmd, PROCESS_INFORMATION processInfo)`
`1471`	`1471`	`}`
`1472`	`1472`	`}`
`1473`	`1473`
	`1474`	`+#ifndef __CYGWIN__`
`1474`	`1475`	`AddUserToDacl(processInfo->hProcess);`
	`1476`	`+#endif`
`1475`	`1477`
`1476`	`1478`	`CloseHandle(restrictedToken);`
`1477`	`1479`