Commitc86c379

committed

If the first argument is --version or --help, skip the root check.

1 parent21d08bc commitc86c379Copy full SHA for c86c379

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.40 2001/01/24 19:42:56 momjian Exp $`
	`16`	`+ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.41 2001/02/06 17:00:01 petere Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -109,7 +109,10 @@ main(int argc, char *argv[])`
`109`	`109`	`* be temporarily disabled there...`
`110`	`110`	`*/`
`111`	`111`	`#ifndef__BEOS__`
`112`		`-if (geteuid()==0)`
	`112`	`+if (!(argc>1`
	`113`	`+&& (strcmp(argv[1],"--help")==0\|\|strcmp(argv[1],"-?")==0`
	`114`	`+\|\|strcmp(argv[1],"--version")==0\|\|strcmp(argv[1],"-V")==0 ))`
	`115`	`+&& (geteuid()==0) )`
`113`	`116`	`{`
`114`	`117`	`fprintf(stderr,"%s",NOROOTEXEC);`
`115`	`118`	`exit(1);`

Comments

(0)