mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split apart pg_upgrade user lookup and root check so '--help' shows

Browse Source 
proper default username.
This commit is contained in:
Bruce Momjian 2010-05-24 16:34:35 +00:00
parent add8044778
commit 00be75415c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pg_upgrade/option.c
View File

@ -48,6 +48,7 @@ parseCommandLine(migratorContext *ctx, int argc, char *argv[])
}; };
char option; /* Command line option */ char option; /* Command line option */
int optindex = 0; /* used by getopt_long */ int optindex = 0; /* used by getopt_long */
int user_id;
if (getenv("PGUSER")) if (getenv("PGUSER"))
{ {
@ -62,6 +63,9 @@ parseCommandLine(migratorContext *ctx, int argc, char *argv[])
ctx->transfer_mode = TRANSFER_MODE_COPY; ctx->transfer_mode = TRANSFER_MODE_COPY;
/* user lookup and 'root' test must be split because of usage() */
user_id = get_user_info(ctx, &ctx->user);
if (argc > 1) if (argc > 1)
{ {
if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 || if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ||
@ -77,7 +81,7 @@ parseCommandLine(migratorContext *ctx, int argc, char *argv[])
} }
} }
if ((get_user_info(ctx, &ctx->user)) == 0) if (user_id == 0)
pg_log(ctx, PG_FATAL, "%s: cannot be run as root\n", ctx->progname); pg_log(ctx, PG_FATAL, "%s: cannot be run as root\n", ctx->progname);
#ifndef WIN32 #ifndef WIN32