database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Fix username mismatch in initdb. Magnus.

Browse Source
This commit is contained in:
Bruce Momjian 2004-07-12 01:54:10 +00:00
parent a919fdfd3d
commit 66d56a8efe
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,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.41 2004/07/01 00:51:36 tgl Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.42 2004/07/12 01:54:10 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1137,7 +1137,7 @@ get_set_pwd(void)
PG_CMD_OPEN; PG_CMD_OPEN;
if (fprintf(pg, if (fprintf(pg,
"ALTER USER \"%s\" WITH PASSWORD '%s';\n", username, pwd1) < 0) "ALTER USER \"%s\" WITH PASSWORD '%s';\n", effective_user, pwd1) < 0)
{ {
/* write failure */ /* write failure */
exit_nicely(); exit_nicely();
@ -1433,7 +1433,7 @@ setup_privileges(void)
PG_CMD_OPEN; PG_CMD_OPEN;
priv_lines = replace_token(privileges_setup, priv_lines = replace_token(privileges_setup,
"$POSTGRES_SUPERUSERNAME", username); "$POSTGRES_SUPERUSERNAME", effective_user);
for (line = priv_lines; *line != NULL; line++) for (line = priv_lines; *line != NULL; line++)
PG_CMD_PUTLINE; PG_CMD_PUTLINE;
@ -2002,9 +2002,10 @@ main(int argc, char *argv[])
exit(1); exit(1);
} }
effective_user = get_id(); if (strlen(username))
if (!strlen(username)) effective_user = username;
username = effective_user; else
effective_user = get_id();
if (strlen(encoding)) if (strlen(encoding))
encodingid = get_encoding_id(encoding); encodingid = get_encoding_id(encoding);
@ -2033,7 +2034,7 @@ main(int argc, char *argv[])
PG_VERSION, PG_VERSION,
pg_data, share_path, bin_path, pg_data, share_path, bin_path,
encoding, encodingid, encoding, encodingid,
username, bki_file, effective_user, bki_file,
desc_file, conf_file, desc_file, conf_file,
hba_file, ident_file); hba_file, ident_file);
if (show_setting) if (show_setting)