Commit0e9e888

committed

Suppress data directory access-permissions check when __CYGWIN__,

per recent pghackers discussions. Improving this should be a TODOfor 7.3.

1 parent388008c commit0e9e888Copy full SHA for 0e9e888

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.261 2001/11/12 05:43:24 tgl Exp $`
	`40`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.262 2001/12/04 16:17:48 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -280,7 +280,9 @@ checkDataDir(const char *checkdir)`
`280`	`280`	`{`
`281`	`281`	`charpath[MAXPGPATH];`
`282`	`282`	`FILE*fp;`
	`283`	`+#ifndef__CYGWIN__`
`283`	`284`	`structstatstat_buf;`
	`285`	`+#endif`
`284`	`286`
`285`	`287`	`if (checkdir==NULL)`
`286`	`288`	`{`
`@@ -295,7 +297,13 @@ checkDataDir(const char *checkdir)`
`295`	`297`
`296`	`298`	`/*`
`297`	`299`	`* Check if the directory has group or world access. If so, reject.`
	`300`	`+ *`
	`301`	`+ * XXX temporarily suppress check when on Windows, because there may`
	`302`	`+ * not be proper support for Unix-y file permissions. Need to think`
	`303`	`+ * of a reasonable check to apply on Windows.`
`298`	`304`	`*/`
	`305`	`+#ifndef__CYGWIN__`
	`306`	`+`
`299`	`307`	`if (stat(checkdir,&stat_buf)==-1)`
`300`	`308`	`{`
`301`	`309`	`if (errno==ENOENT)`
`@@ -309,6 +317,8 @@ checkDataDir(const char *checkdir)`
`309`	`317`	`elog(FATAL,"data directory %s has group or world access; permissions should be u=rwx (0700)",`
`310`	`318`	`checkdir);`
`311`	`319`
	`320`	`+#endif/* !__CYGWIN__ */`
	`321`	`+`
`312`	`322`	`/* Look for PG_VERSION before looking for pg_control */`
`313`	`323`	`ValidatePgVersion(checkdir);`
`314`	`324`

Comments

(0)