aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2008-02-29 23:31:42 +0000
committerAndrew Dunstan <andrew@dunslane.net>2008-02-29 23:31:42 +0000
commitda956ae76fa08924bb6c1bcd7323ef0566a0194b (patch)
tree226ad2fe0b046efe5ba31e23fdc48b88d91ffcf8
parentc6f401573f1c439f018849131ac18f8199f7085c (diff)
downloadpostgresql-da956ae76fa08924bb6c1bcd7323ef0566a0194b.tar.gz
postgresql-da956ae76fa08924bb6c1bcd7323ef0566a0194b.zip
Don't call AddUserToDacl on Cygwin
-rw-r--r--src/bin/initdb/initdb.c4
-rw-r--r--src/bin/pg_ctl/pg_ctl.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index b34b22d5ccb..abdb4d3f259 100644
--- 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
index 205b2d1069e..83fa412282a 100644
--- 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);