Change rather bizarre code ordering in get_id(). This isn't strictly

tglsfdc · tglsfdc · commit a7a7f5caaaf9 · 2009-06-03T16:17:49.000Z
cosmetic --- I'm wondering if geteuid could have side effects on errno,
thus possibly resulting in a misleading error message after failure of
getpwuid.
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.170 2009/04/05 04:19:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.171 2009/06/03 16:17:49 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -654,8 +654,6 @@ get_id(void)
 
 	struct passwd *pw;
 
-	pw = getpwuid(geteuid());
-
 	if (geteuid() == 0)			/* 0 is root's uid */
 	{
 		fprintf(stderr,
@@ -666,6 +664,8 @@ get_id(void)
 				progname);
 		exit(1);
 	}
+
+	pw = getpwuid(geteuid());
 	if (!pw)
 	{
 		fprintf(stderr,

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.170 2009/04/05 04:19:58 tgl Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.171 2009/06/03 16:17:49 tgl Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -654,8 +654,6 @@ get_id(void)`
`654`	`654`
`655`	`655`	`struct passwd *pw;`
`656`	`656`
`657`		`- pw = getpwuid(geteuid());`
`658`		`-`
`659`	`657`	`if (geteuid() == 0) /* 0 is root's uid */`
`660`	`658`	`{`
`661`	`659`	`fprintf(stderr,`
`@@ -666,6 +664,8 @@ get_id(void)`
`666`	`664`	`progname);`
`667`	`665`	`exit(1);`
`668`	`666`	`}`
	`667`	`+`
	`668`	`+ pw = getpwuid(geteuid());`
`669`	`669`	`if (!pw)`
`670`	`670`	`{`
`671`	`671`	`fprintf(stderr,`