From ff402ae11b4d33e0e46c2730f63033d3631b8010 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 23 Dec 2015 15:45:43 -0500 Subject: Improve handling of password reuse in src/bin/scripts programs. This reverts most of commit 83dec5a71 in favor of having connectDatabase() store the possibly-reusable password in a static variable, similar to the coding we've had for a long time in pg_dump's version of that function. To avoid possible problems with unwanted password reuse, make callers specify whether it's reasonable to attempt to re-use the password. This is a wash for cases where re-use isn't needed, but it is far simpler for callers that do want that. Functionally there should be no difference. Even though we're past RC1, it seems like a good idea to back-patch this into 9.5, like the prior commit. Otherwise, if there are any third-party users of connectDatabase(), they'll have to deal with an API change in 9.5 and then another one in 9.6. Michael Paquier --- src/bin/scripts/clusterdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bin/scripts/clusterdb.c') diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c index 2f15c82273f..f87a9cee295 100644 --- a/src/bin/scripts/clusterdb.c +++ b/src/bin/scripts/clusterdb.c @@ -203,8 +203,8 @@ cluster_one_database(const char *dbname, bool verbose, const char *table, appendPQExpBuffer(&sql, " %s", table); appendPQExpBufferChar(&sql, ';'); - conn = connectDatabase(dbname, host, port, username, NULL, prompt_password, - progname, false); + conn = connectDatabase(dbname, host, port, username, prompt_password, + progname, false, false); if (!executeMaintenanceCommand(conn, sql.data, echo)) { if (table) -- cgit v1.2.3