summaryrefslogtreecommitdiff
path: root/src/bin/scripts/dropuser.c
diff options
context:
space:
mode:
authorTom Lane2015-12-23 20:45:43 +0000
committerTom Lane2015-12-23 20:45:43 +0000
commitff402ae11b4d33e0e46c2730f63033d3631b8010 (patch)
tree0d5613733254659db835e97d8f0cd6a0df2e3f71 /src/bin/scripts/dropuser.c
parent1aa41e3eae3746e05d0e23286ac740a9a6cee7df (diff)
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
Diffstat (limited to 'src/bin/scripts/dropuser.c')
-rw-r--r--src/bin/scripts/dropuser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 10d0691c677..1b0cf78f2a4 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -128,8 +128,8 @@ main(int argc, char *argv[])
appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
(if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
- conn = connectDatabase("postgres", host, port, username, NULL,
- prompt_password, progname, false);
+ conn = connectDatabase("postgres", host, port, username, prompt_password,
+ progname, false, false);
if (echo)
printf("%s\n", sql.data);