From a335389bbe31fdf365250fdbdf1f5d01940dad86 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 26 Apr 2017 12:57:12 +0300 Subject: [PATCH 3/3] Use new PQencryptPasswordConn function in psql and createuser This fixes the issue reported by Jeff Janes, that there was previously no way to create a SCRAM verifier with "\password". Michael Paquier and me Discussion: https://www.postgresql.org/message-id/CAMkU%3D1wfBgFPbfAMYZQE78p%3DVhZX7nN86aWkp0QcCp%3D%2BKxZ%3Dbg%40mail.gmail.com --- src/bin/psql/command.c | 2 +- src/bin/scripts/createuser.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 859ded71f6..51bd8f9cc9 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -1878,7 +1878,7 @@ exec_command_password(PsqlScanState scan_state, bool active_branch) else user = PQuser(pset.db); - encrypted_password = PQencryptPassword(pw1, user); + encrypted_password = PQencryptPasswordConn(pset.db, pw1, user, NULL); if (!encrypted_password) { diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c index 3d74797a8f..087a5ca05f 100644 --- a/src/bin/scripts/createuser.c +++ b/src/bin/scripts/createuser.c @@ -274,8 +274,10 @@ main(int argc, char *argv[]) { char *encrypted_password; - encrypted_password = PQencryptPassword(newpassword, - newuser); + encrypted_password = PQencryptPasswordConn(conn, + newpassword, + newuser, + NULL); if (!encrypted_password) { fprintf(stderr, _("Password encryption failed.\n")); -- 2.11.0