rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

cosmetic --- I'm wondering if geteuid could have side effects on errno,
thus possibly resulting in a misleading error message after failure of
getpwuid.
This commit is contained in:
Tom Lane 2009-06-03 16:17:49 +00:00
parent e550763121
commit a7a7f5caaa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/initdb/initdb.c
View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * 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; struct passwd *pw;
pw = getpwuid(geteuid());
if (geteuid() == 0) /* 0 is root's uid */ if (geteuid() == 0) /* 0 is root's uid */
{ {
fprintf(stderr, fprintf(stderr,
@ -666,6 +664,8 @@ get_id(void)
progname); progname);
exit(1); exit(1);
} }
pw = getpwuid(geteuid());
if (!pw) if (!pw)
{ {
fprintf(stderr, fprintf(stderr,