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

Give a proper error message if initdb password file is empty. 

Used to say just "could not read password from file "...": Success", which
isn't very informative.

Mats Erik Andersson. Backpatch to all supported versions.
This commit is contained in:
Heikki Linnakangas 2014-12-05 14:27:56 +02:00
parent c0f279c469
commit 198cbe0a0c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1663,8 +1663,12 @@ get_set_pwd(void)
}
if (!fgets(pwdbuf, sizeof(pwdbuf), pwf))
{
fprintf(stderr, _("%s: could not read password from file \"%s\": %s\n"),
progname, pwfilename, strerror(errno));
if (ferror(pwf))
fprintf(stderr, _("%s: could not read password from file \"%s\": %s\n"),
progname, pwfilename, strerror(errno));
else
fprintf(stderr, _("%s: password file \"%s\" is empty\n"),
progname, pwfilename);
exit_nicely();
}
fclose(pwf);