From 198cbe0a0c4b539c9f9f3f2e9169d774d1d39a8e Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Fri, 5 Dec 2014 14:27:56 +0200
Subject: [PATCH] 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.
---
src/bin/initdb/initdb.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index ed082409b72..3ca4f054b51 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -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);
--
GitLab